X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46675b4610f8d21e6bc1839c35fdb2cb508971f2..df53be12c55c077d9c2e1c479a1552188638495c:/include/wx/motif/frame.h diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index 7a63af17e4..64f808bbad 100644 --- a/include/wx/motif/frame.h +++ b/include/wx/motif/frame.h @@ -12,11 +12,7 @@ #ifndef _WX_MOTIF_FRAME_H_ #define _WX_MOTIF_FRAME_H_ -#ifdef __GNUG__ -#pragma interface "frame.h" -#endif - -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() { Init(); } @@ -29,10 +25,10 @@ public: const wxString& name = wxFrameNameStr) { Init(); - + Create(parent, id, title, pos, size, style, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -40,41 +36,40 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - + virtual ~wxFrame(); - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); // Set menu bar void SetMenuBar(wxMenuBar *menu_bar); - + // Set title void SetTitle(const wxString& title); - + // Set icon - virtual void SetIcon(const wxIcon& icon); virtual void SetIcons(const wxIconBundle& icons); #if wxUSE_STATUSBAR virtual void PositionStatusBar(); #endif // wxUSE_STATUSBAR - + // Create toolbar #if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, - wxWindowID id = -1, + virtual wxToolBar* CreateToolBar(long style = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); virtual void SetToolBar(wxToolBar *toolbar); virtual void PositionToolBar(); #endif // wxUSE_TOOLBAR - + // Implementation only from now on // ------------------------------- - + 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; @@ -82,9 +77,9 @@ public: WXWidget GetWorkAreaWidget() const { return m_workArea; } WXWidget GetClientAreaWidget() const { return m_clientArea; } WXWidget GetTopWidget() const { return m_frameShell; } - + virtual WXWidget GetMainWidget() const { return m_mainWidget; } - + // The widget that can have children on it WXWidget GetClientWidget() const; bool GetVisibleStatus() const { return m_visibleStatus; } @@ -92,10 +87,9 @@ public: bool PreResize(); - void SendSizeEvent(); - // for generic/mdig.h - virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoGetClientSize(int *width, int *height) const; + private: // common part of all ctors void Init(); @@ -109,26 +103,27 @@ private: WXWidget m_clientArea; bool m_visibleStatus; 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); 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_ +