use #if WXWIN_COMPAT and not #ifdef (patch 826160)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -170,7 +170,7 @@ public:
|
||||
// if you are hiding the help, TRUE otherwise
|
||||
virtual void DoGiveHelp(const wxString& text, bool show);
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY_2_2
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
// call this to simulate a menu command
|
||||
bool Command(int winid) { return ProcessCommand(winid); }
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
@@ -87,8 +87,8 @@ public:
|
||||
m_gaugePos;
|
||||
|
||||
// obsolete functions, don't use
|
||||
#ifdef WXWIN_COMPATIBILITY_2_2
|
||||
bool GetProgressBar() const { return TRUE; }
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
bool GetProgressBar() const { return true; }
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
protected:
|
||||
|
@@ -87,8 +87,8 @@ public:
|
||||
m_gaugePos;
|
||||
|
||||
// obsolete functions, don't use
|
||||
#ifdef WXWIN_COMPATIBILITY_2_2
|
||||
bool GetProgressBar() const { return TRUE; }
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
bool GetProgressBar() const { return true; }
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
protected:
|
||||
|
@@ -107,7 +107,7 @@ public:
|
||||
( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
|
||||
}
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY_2_4
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
// Initializes parent pointers and hash table for fast searching.
|
||||
wxDEPRECATED( static void InitializeClasses() );
|
||||
// Cleans up hash table used for fast searching.
|
||||
@@ -149,7 +149,7 @@ protected:
|
||||
|
||||
WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY_2_4
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
inline void wxClassInfo::InitializeClasses() {}
|
||||
inline void wxClassInfo::CleanUpClasses() {}
|
||||
#endif
|
||||
|
@@ -204,7 +204,7 @@ public:
|
||||
virtual void SetBorder(int border) = 0;
|
||||
|
||||
// wxWizard should be created using "new wxWizard" now, not with Create()
|
||||
#ifdef WXWIN_COMPATIBILITY_2_2
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
static wxWizard *Create(wxWindow *parent,
|
||||
int id = -1,
|
||||
const wxString& title = wxEmptyString,
|
||||
|
@@ -1656,7 +1656,7 @@ public:
|
||||
// gets the streaming callback from this class or any superclass
|
||||
wxObjectStreamingCallback GetStreamingCallback() const ;
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY_2_4
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
// Initializes parent pointers and hash table for fast searching.
|
||||
wxDEPRECATED( static void InitializeClasses() );
|
||||
// Cleans up hash table used for fast searching.
|
||||
|
@@ -738,7 +738,7 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
|
||||
// our public interface
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY_2_2
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
/* static */
|
||||
wxWizard *wxWizardBase::Create(wxWindow *parent,
|
||||
|
Reference in New Issue
Block a user