X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9dae7798b164a5f4abc85d16f49cabd4e0980c0..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/include/wx/motif/frame.h diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index abafe0237b..ed717d2a69 100644 --- a/include/wx/motif/frame.h +++ b/include/wx/motif/frame.h @@ -12,7 +12,7 @@ #ifndef _WX_MOTIF_FRAME_H_ #define _WX_MOTIF_FRAME_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "frame.h" #endif @@ -43,7 +43,7 @@ public: virtual ~wxFrame(); - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); // Set menu bar void SetMenuBar(wxMenuBar *menu_bar); @@ -62,7 +62,7 @@ public: // Create toolbar #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); virtual void SetToolBar(wxToolBar *toolbar); virtual void PositionToolBar(); @@ -74,7 +74,7 @@ public: void OnSysColourChanged(wxSysColourChangedEvent& event); void OnActivate(wxActivateEvent& event); - virtual void ChangeFont(bool keepOriginalSize = TRUE); + virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); WXWidget GetMenuBarWidget() const; @@ -111,7 +111,6 @@ private: bool m_iconized; virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetPosition(int *x, int *y) const; virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);