Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed #errors in 2.7 compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 20:39:23 +00:00
parent 53c5fb20ed
commit 81f6ea4a29
4 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/motif/dcclient.h
View File

@@ -164,13 +164,6 @@ protected:
int m_currentStyle ; int m_currentStyle ;
int m_currentFill ; int m_currentFill ;
int m_autoSetting ; // See comment in dcclient.cpp int m_autoSetting ; // See comment in dcclient.cpp
// this is useless and should be removed, kept for now just for backwards
// compatibility
#if wxCHECK_VERSION(2, 7, 0)
#error "Remove wxClientDC::m_oldFont"
#endif
WXFont m_oldFont;
}; };
class WXDLLEXPORT wxPaintDC: public wxWindowDC class WXDLLEXPORT wxPaintDC: public wxWindowDC
@@ -193,5 +186,5 @@ public:
wxClientDC(wxWindow* win) : wxWindowDC(win) { } wxClientDC(wxWindow* win) : wxWindowDC(win) { }
}; };
#endif #endif // _WX_DCCLIENT_H_
// _WX_DCCLIENT_H_

8
src/common/event.cpp
View File

@@ -236,14 +236,6 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE) DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED) DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED)
// see comments in wx/event.h, near wxEVT_SCROLL_ENDSCROLL declaration
#if wxCHECK_VERSION(2, 7, 0)
#error "Remove the lines below, not needed any more"
#endif
#undef wxEVT_SCROLL_ENDSCROLL
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_ENDSCROLL;
const wxEventType wxEVT_SCROLL_ENDSCROLL = wxEVT_SCROLL_CHANGED;
// Scroll events from wxWindow // Scroll events from wxWindow
DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP) DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM) DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)

9
src/generic/wizard.cpp
View File

@@ -263,12 +263,9 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
// generic wxWizard implementation // generic wxWizard implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxCHECK_VERSION(2, 7, 0) // FIXME: this is a hack
#error "Fix wxGTK vs. wxMSW difference other way" WX_DEFINE_ARRAY_PTR(wxWizard *, wxModelessWizards);
#else static wxModelessWizards modelessWizards;
WX_DEFINE_ARRAY_PTR(wxWizard *, wxModelessWizards);
wxModelessWizards modelessWizards;
#endif
void wxWizard::Init() void wxWizard::Init()
{ {

1
src/motif/dcclient.cpp
View File

@@ -149,7 +149,6 @@ void wxWindowDC::Init()
m_display = (WXDisplay*) NULL; m_display = (WXDisplay*) NULL;
m_pixmap = (WXPixmap) 0; m_pixmap = (WXPixmap) 0;
m_autoSetting = 0; m_autoSetting = 0;
m_oldFont = (WXFont) 0;
m_ok = false; m_ok = false;
m_clipRegion = (WXRegion) 0; m_clipRegion = (WXRegion) 0;
} }