Patch level :4.0 676

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

View File

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