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
This commit is contained in:
parent
ce52988a85
commit
8c624a14ad
@ -507,6 +507,8 @@
|
||||
|
||||
#define wxUSE_DC_CACHEING 0
|
||||
|
||||
#define wxUSE_GADGETS 0
|
||||
|
||||
/*
|
||||
* Supports bool type
|
||||
*/
|
||||
|
@ -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();
|
||||
#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;
|
||||
|
@ -189,7 +189,7 @@ wxChoice::~wxChoice()
|
||||
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,
|
||||
|
@ -55,7 +55,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
|
||||
Widget parentWidget = (Widget) parent->GetClientWidget();
|
||||
|
||||
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
|
||||
#if USE_GADGETS
|
||||
#if wxUSE_GADGETS
|
||||
xmLabelGadgetClass, parentWidget,
|
||||
#else
|
||||
xmLabelWidgetClass, parentWidget,
|
||||
|
Loading…
Reference in New Issue
Block a user