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

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

Browse Source 
not plain #if.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-08-18 00:35:02 +00:00
parent ce52988a85
commit 8c624a14ad
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.h.in
View File

@@ -507,6 +507,8 @@
#define wxUSE_DC_CACHEING 0 #define wxUSE_DC_CACHEING 0
#define wxUSE_GADGETS 0
/* /*
* Supports bool type * Supports bool type
*/ */

2
src/common/popupcmn.cpp
View File

@@ -259,7 +259,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
// subclass the window which has the focus, and not winFocus passed in or // subclass the window which has the focus, and not winFocus passed in or
// otherwise everything else breaks down // otherwise everything else breaks down
m_focus = FindFocus(); m_focus = FindFocus();
#elif __WXGTK__ #elif defined(__WXGTK__)
// GTK+ catches the activate events from the popup // GTK+ catches the activate events from the popup
// window, not the focus events from the child window // window, not the focus events from the child window
m_focus = this; m_focus = this;

2
src/motif/choice.cpp
View File

@@ -189,7 +189,7 @@ wxChoice::~wxChoice()
int wxChoice::DoAppend(const wxString& item) int wxChoice::DoAppend(const wxString& item)
{ {
Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item), Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
#if USE_GADGETS #if wxUSE_GADGETS
xmPushButtonGadgetClass, (Widget) m_menuWidget, xmPushButtonGadgetClass, (Widget) m_menuWidget,
#else #else
xmPushButtonWidgetClass, (Widget) m_menuWidget, xmPushButtonWidgetClass, (Widget) m_menuWidget,

2
src/motif/statbmp.cpp
View File

@@ -55,7 +55,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
Widget parentWidget = (Widget) parent->GetClientWidget(); Widget parentWidget = (Widget) parent->GetClientWidget();
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap", m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
#if USE_GADGETS #if wxUSE_GADGETS
xmLabelGadgetClass, parentWidget, xmLabelGadgetClass, parentWidget,
#else #else
xmLabelWidgetClass, parentWidget, xmLabelWidgetClass, parentWidget,