root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :4.0 676

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :aggiunti un po' di wxCHECK_VERSION per istruzioni che non esistono in wx263


git-svn-id: svn://10.65.10.50/trunk@15198 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-04-10 08:16:21 +00:00
parent 1faa2eb7f9
commit 35c81b9e16
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xvaga/xvaga.cpp
View File

@ -176,14 +176,11 @@ const wxCursor* GetCursorResource(int rid)
const wxString strName = ::GetResourceName("Cursor", rid); const wxString strName = ::GetResourceName("Cursor", rid);
if (::wxFileExists(strName)) if (::wxFileExists(strName))
{ {
#if wxCHECK_VERSION(2,8,0) if (strName.Find(".ico") > 0)
if (strName.EndsWith(".ico"))
cursor = new wxCursor(strName, wxBITMAP_TYPE_ICO); cursor = new wxCursor(strName, wxBITMAP_TYPE_ICO);
else else
cursor = new wxCursor(strName, wxBITMAP_TYPE_CUR); cursor = new wxCursor(strName, wxBITMAP_TYPE_CUR);
#else
cursor = new wxCursor(strName, wxBITMAP_TYPE_CUR);
#endif
if (!cursor->Ok()) if (!cursor->Ok())
{ {
delete cursor; delete cursor;
@ -720,7 +717,9 @@ protected:
virtual void OnKeyDown(wxKeyEvent& e); virtual void OnKeyDown(wxKeyEvent& e);
virtual void OnKillFocus(wxFocusEvent& e); virtual void OnKillFocus(wxFocusEvent& e);
virtual void OnMenu(wxCommandEvent& e); virtual void OnMenu(wxCommandEvent& e);
#if wxCHECK_VERSION(2,8,0)
virtual void OnMouseCaptureLost(wxMouseCaptureLostEvent& e); virtual void OnMouseCaptureLost(wxMouseCaptureLostEvent& e);
#endif
virtual void OnMouseDouble(wxMouseEvent& e); virtual void OnMouseDouble(wxMouseEvent& e);
virtual void OnMouseDown(wxMouseEvent& e); virtual void OnMouseDown(wxMouseEvent& e);
virtual void OnMouseMove(wxMouseEvent& e); virtual void OnMouseMove(wxMouseEvent& e);
@ -800,7 +799,9 @@ BEGIN_EVENT_TABLE(TwxWindow, TwxWindowBase)
EVT_MIDDLE_DOWN(TwxWindow::OnMouseDown) EVT_MIDDLE_DOWN(TwxWindow::OnMouseDown)
EVT_MIDDLE_UP(TwxWindow::OnMouseUp) EVT_MIDDLE_UP(TwxWindow::OnMouseUp)
EVT_MOTION(TwxWindow::OnMouseMove) EVT_MOTION(TwxWindow::OnMouseMove)
#if wxCHECK_VERSION(2,8,0)
EVT_MOUSE_CAPTURE_LOST(TwxWindow::OnMouseCaptureLost) EVT_MOUSE_CAPTURE_LOST(TwxWindow::OnMouseCaptureLost)
#endif
EVT_MOUSEWHEEL(TwxWindow::OnMouseWheel) EVT_MOUSEWHEEL(TwxWindow::OnMouseWheel)
EVT_PAINT(TwxWindow::OnPaint) EVT_PAINT(TwxWindow::OnPaint)
EVT_RIGHT_DOWN(TwxWindow::OnMouseDown) EVT_RIGHT_DOWN(TwxWindow::OnMouseDown)
@ -958,10 +959,12 @@ void TwxWindow::OnMenu(wxCommandEvent& evt)
DoXvtEvent(e); DoXvtEvent(e);
} }
#if wxCHECK_VERSION(2,8,0)
void TwxWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(e)) void TwxWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(e))
{ {
xvt_win_release_pointer(); xvt_win_release_pointer();
} }
#endif
void TwxWindow::OnMouseDouble(wxMouseEvent& evt) void TwxWindow::OnMouseDouble(wxMouseEvent& evt)
{ {
@ -4021,9 +4024,11 @@ void xvt_sbar_set_pos(WINDOW win, SCROLL_TYPE t, int pos)
case HVGAUGE: case HVGAUGE:
{ {
CAST_GAUGE(win, g); CAST_GAUGE(win, g);
#if wxCHECK_VERSION(2,8,0)
if (g.GetRange() <= 1) if (g.GetRange() <= 1)
g.Pulse(); g.Pulse();
else else
#endif
g.SetValue(pos); g.SetValue(pos);
} }
break; break;