X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..df53be12c55c077d9c2e1c479a1552188638495c:/include/wx/motif/frame.h diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index d6d7ffe5e8..64f808bbad 100644 --- a/include/wx/motif/frame.h +++ b/include/wx/motif/frame.h @@ -6,17 +6,13 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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 +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() { Init(); } @@ -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); @@ -52,7 +48,6 @@ public: void SetTitle(const wxString& title); // Set icon - virtual void SetIcon(const wxIcon& icon); virtual void SetIcons(const wxIconBundle& icons); #if wxUSE_STATUSBAR @@ -62,7 +57,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 +69,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; @@ -92,10 +87,9 @@ public: bool PreResize(); - void SendSizeEvent(); - // for generic/mdig.h virtual void DoGetClientSize(int *width, int *height) const; + private: // common part of all ctors void Init(); @@ -117,17 +111,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_ +