X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..c9057ae1c565cc4ae6c2cf84dd19d65a64ee2b7b:/include/wx/gtk1/mdi.h?ds=sidebyside diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index d49600fa0a..0de3e863bc 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -35,8 +35,8 @@ class wxMDIChildFrame; // global data //----------------------------------------------------------------------------- -extern const char* wxFrameNameStr; -extern const char* wxStatusLineNameStr; +extern const wxChar* wxFrameNameStr; +extern const wxChar* wxStatusLineNameStr; //----------------------------------------------------------------------------- // wxMDIParentFrame @@ -48,9 +48,9 @@ class wxMDIParentFrame: public wxFrame friend class wxMDIChildFrame; - public: +public: - wxMDIParentFrame(void); + wxMDIParentFrame(); wxMDIParentFrame( wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -65,32 +65,28 @@ class wxMDIParentFrame: public wxFrame void GetClientSize(int *width, int *height) const; - wxMDIChildFrame *GetActiveChild(void) const; + wxMDIChildFrame *GetActiveChild() const; - wxMDIClientWindow *GetClientWindow(void) const; - virtual wxMDIClientWindow *OnCreateClient(void); + wxMDIClientWindow *GetClientWindow() const; + virtual wxMDIClientWindow *OnCreateClient(); - virtual void Cascade(void) {}; - virtual void Tile(void) {}; - virtual void ArrangeIcons(void) {}; - virtual void ActivateNext(void); - virtual void ActivatePrevious(void); + virtual void Cascade() {} + virtual void Tile() {} + virtual void ArrangeIcons() {} + virtual void ActivateNext(); + virtual void ActivatePrevious(); void OnActivate( wxActivateEvent& event ); void OnSysColourChanged( wxSysColourChangedEvent& event ); - // implementation - - wxMDIChildFrame *m_currentChild; - - void SetMDIMenuBar( wxMenuBar *menu_bar ); + // implementation + + wxMDIClientWindow *m_clientWindow; + bool m_justInserted; + virtual void GtkOnSize( int x, int y, int width, int height ); + virtual void OnInternalIdle(); - private: - - wxMDIClientWindow *m_clientWindow; - bool m_parentFrameActive; - DECLARE_EVENT_TABLE() }; @@ -104,12 +100,12 @@ class wxMDIChildFrame: public wxFrame public: - wxMDIChildFrame(void); + wxMDIChildFrame(); wxMDIChildFrame( wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); - ~wxMDIChildFrame(void); + ~wxMDIChildFrame(); bool Create( wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -119,28 +115,34 @@ class wxMDIChildFrame: public wxFrame virtual wxMenuBar *GetMenuBar() const; virtual void GetClientSize( int *width, int *height ) const; - virtual void AddChild( wxWindow *child ); + virtual void AddChild( wxWindowBase *child ); - virtual void Activate(void); + virtual void Activate(); +#if wxUSE_STATUSBAR // no status bars - virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, - wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; } - virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; } - virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {} - virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {} + virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1, + long WXUNUSED(style) = 1, + wxWindowID WXUNUSED(id) = 1, + const wxString& WXUNUSED(name) = wxEmptyString) + { return (wxStatusBar*)NULL; } + + virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; } + virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {} + virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {} +#endif // no size hints virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW), int WXUNUSED(maxH), - int WXUNUSED(incW) ) - { - } + int WXUNUSED(maxW), int WXUNUSED(maxH), + int WXUNUSED(incW), int WXUNUSED(incH) ) {} +#if wxUSE_TOOLBAR // no toolbar bars virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } +#endif // no icon void SetIcon( const wxIcon &icon ) { m_icon = icon; } @@ -150,18 +152,16 @@ class wxMDIChildFrame: public wxFrame wxString GetTitle() const { return m_title; } // no maximize etc - virtual void Maximize(void) {} - virtual void Restore(void) {} + virtual void Maximize( bool WXUNUSED(maximize) ) {} + virtual void Restore() {} void OnActivate( wxActivateEvent &event ); - public: + // implementation wxMenuBar *m_menuBar; - -// private: - GtkNotebookPage *m_page; + bool m_justInserted; DECLARE_EVENT_TABLE() }; @@ -174,11 +174,11 @@ class wxMDIClientWindow: public wxWindow { DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) - public: +public: - wxMDIClientWindow(void); + wxMDIClientWindow(); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); - ~wxMDIClientWindow(void); + ~wxMDIClientWindow(); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); };