Avoid some -Wundef warning. Check for __WXGTK__ using defined,

not plain #if.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/setup.h.in b/setup.h.in
index 41ac395a69e3e30f3cb34e7d773f9785f922242b..3094b511cf19168ddf4b7c03ee6a9ecbba912446 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -507,6 +507,8 @@
 
 #define wxUSE_DC_CACHEING 0
 
 
 #define wxUSE_DC_CACHEING 0
 

+#define wxUSE_GADGETS 0
+

 /*
  * Supports bool type
  */
 /*
  * Supports bool type
  */

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 5150d08a04df72e8de12d27e044499195f46d15d..e29d8d2619b49e72bfbc455017f3c01448be6b4a 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -259,7 +259,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     m_focus = FindFocus();
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     m_focus = FindFocus();

-#elif __WXGTK__
+#elif defined(__WXGTK__)

     // GTK+ catches the activate events from the popup
     // window, not the focus events from the child window
     m_focus = this;
     // GTK+ catches the activate events from the popup
     // window, not the focus events from the child window
     m_focus = this;

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 24857bdf41992705e98d6673276e36cadc5fc2b4..8ce104a578ac9c3bf2caca8031bca585ea9448e9 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -189,7 +189,7 @@ wxChoice::~wxChoice()
 int wxChoice::DoAppend(const wxString& item)
 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
 int wxChoice::DoAppend(const wxString& item)
 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),

-#if USE_GADGETS
+#if wxUSE_GADGETS

         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
         xmPushButtonWidgetClass, (Widget) m_menuWidget,
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
         xmPushButtonWidgetClass, (Widget) m_menuWidget,

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 5d39f6906982e6d21ca663d2c0258b9a21e157e9..f576c57c8442a04879e9aaaa44c8827989ace96a 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -55,7 +55,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",

-#if USE_GADGETS
+#if wxUSE_GADGETS

                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,
                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,