X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dad6a47e6d425673510b53e9a01114cdea2a5f2c..8c94336825149d5f329eaea77ba32ae5b5fd3a31:/include/wx/motif/frame.h diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index 4cb7f953c8..a5cf199637 100644 --- a/include/wx/motif/frame.h +++ b/include/wx/motif/frame.h @@ -12,10 +12,6 @@ #ifndef _WX_MOTIF_FRAME_H_ #define _WX_MOTIF_FRAME_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "frame.h" -#endif - class WXDLLEXPORT wxFrame : public wxFrameBase { public: @@ -43,7 +39,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 +58,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 +70,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; @@ -117,17 +113,19 @@ private: virtual void DoSetClientSize(int width, int height); private: - virtual bool DoCreate( wxWindow* parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ); - virtual void DoDestroy(); + virtual bool XmDoCreateTLW(wxWindow* parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name); + + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) }; -#endif -// _WX_MOTIF_FRAME_H_ +#endif // _WX_MOTIF_FRAME_H_ +