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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 3f769979b65740008bba6ea899a02817cb3ed079..e202679bb9b1a6800a9b265db0724479c06934f1 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 47606768003477f372702e03a20ad74eebec5640..ced1476387a70e877163e236a5268eb97d82bf8a 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -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:

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 47606768003477f372702e03a20ad74eebec5640..ced1476387a70e877163e236a5268eb97d82bf8a 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -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:

diff --git a/include/wx/object.h b/include/wx/object.h
index 49027a7e30462aab9f423dad5d49302925afd95f..e4faf7a05b1f614d49dfdfc3330a34d67cd35c3c 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -107,11 +107,11 @@ 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() );
+    wxDEPRECATED( static void InitializeClasses() );
     // Cleans up hash table used for fast searching.
-    wxDEPRECATED( static void     CleanUpClasses() );
+    wxDEPRECATED( static void CleanUpClasses() );
 #endif
     static void     CleanUp();
     
@@ -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

diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 9bbd2358775027d8790d1100e024fd79fce19104..b9e79b702cb314d36262b33cd92a58a6fca181b3 100644 (file)
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -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,

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 733dec8dec227eeeccc40e2fb0c3dd4452742ed6..0a2702e9d1c806349d227fea12fce74e80d5b109 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -1656,13 +1656,13 @@ 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() );
+    wxDEPRECATED( static void InitializeClasses() );
     // Cleans up hash table used for fast searching.
-    wxDEPRECATED( static void     CleanUpClasses() );
+    wxDEPRECATED( static void CleanUpClasses() );
 #endif
-    static void     CleanUp();
+    static void CleanUp();
 
     // returns the first property
     const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 532315b1f8ca930648ac75a3dcb312b4885edd86..ef910605681120fbd94227ec6c22eaaa53693ec2 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -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,