From ab16f4a30034063c1bbd1b0977a5093e7ff88602 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Jul 1998 16:06:23 +0000 Subject: [PATCH] DoMenuUpdates() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/frame.h | 110 ++++++++++++++++++++++------------------ include/wx/gtk1/frame.h | 110 ++++++++++++++++++++++------------------ 2 files changed, 122 insertions(+), 98 deletions(-) diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 07e4e586ff..e98c4acd17 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -5,7 +5,7 @@ // Created: 01/02/97 // Id: // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,56 +42,68 @@ extern const char *wxFrameNameStr; class wxFrame: public wxWindow { - DECLARE_DYNAMIC_CLASS(wxFrame) +public: + // construction + wxFrame(); + wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, + const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); + bool Create( wxWindow *parent, wxWindowID id, const wxString &title, + const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); + ~wxFrame(); + bool Destroy(); + + // operations + // + virtual bool Show( bool show ); + virtual void Enable( bool enable ); + + // frame size + virtual void GetClientSize( int *width, int *height ) const; + // set minimal size for the frame (@@@ other params not implemented) + void SetSizeHints(int minW, int minH, + int maxW = -1, int maxH = -1, + int incW = -1); + + // status bar + virtual bool CreateStatusBar( int number = 1 ); + wxStatusBar *GetStatusBar(); + virtual void SetStatusText( const wxString &text, int number = 0 ); + virtual void SetStatusWidths( int n, int *width ); + + // menu bar + void SetMenuBar( wxMenuBar *menuBar ); + wxMenuBar *GetMenuBar(); + + // frame title + void SetTitle( const wxString &title ); + wxString GetTitle() const { return m_title; } - public: - - wxFrame(void); - wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); - bool Create( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); - ~wxFrame(void); - bool Destroy(void); - void OnCloseWindow( wxCloseEvent& event ); - virtual bool Show( bool show ); - virtual void Enable( bool enable ); - virtual void GetClientSize( int *width, int *height ) const; - void OnSize( wxSizeEvent &event ); - void SetMenuBar( wxMenuBar *menuBar ); - virtual bool CreateStatusBar( int number = 1 ); - virtual void SetStatusText( const wxString &text, int number = 0 ); - virtual void SetStatusWidths( int n, int *width ); - wxStatusBar *GetStatusBar(void); - wxMenuBar *GetMenuBar(void); - void SetTitle( const wxString &title ); - wxString GetTitle(void) const; - void OnActivate( wxActivateEvent &WXUNUSED(event) ) {}; - void OnIdle( wxIdleEvent &event ); - - //private: - - virtual void GtkOnSize( int x, int y, int width, int height ); - void DoMenuUpdates(void); - void DoMenuUpdates(wxMenu* menu); - - - private: - - friend wxWindow; - friend wxMDIChildFrame; - - wxMenuBar *m_frameMenuBar; - GtkWidget *m_mainWindow; - wxStatusBar *m_frameStatusBar; - bool m_doingOnSize; - wxString m_title; - - + // implementation + void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp + void OnSize( wxSizeEvent &event ); + void OnCloseWindow( wxCloseEvent& event ); + void OnIdle(wxIdleEvent& event); + + virtual void GtkOnSize( int x, int y, int width, int height ); + +private: + friend wxWindow; + friend wxMDIChildFrame; + + // update frame's menus (called from OnIdle) + void DoMenuUpdates(); + void DoMenuUpdates(wxMenu* menu); + + GtkWidget *m_mainWindow; + wxMenuBar *m_frameMenuBar; + wxStatusBar *m_frameStatusBar; + bool m_doingOnSize; + wxString m_title; + + DECLARE_DYNAMIC_CLASS(wxFrame) DECLARE_EVENT_TABLE() - }; #endif // __GTKFRAMEH__ diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 07e4e586ff..e98c4acd17 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -5,7 +5,7 @@ // Created: 01/02/97 // Id: // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,56 +42,68 @@ extern const char *wxFrameNameStr; class wxFrame: public wxWindow { - DECLARE_DYNAMIC_CLASS(wxFrame) +public: + // construction + wxFrame(); + wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, + const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); + bool Create( wxWindow *parent, wxWindowID id, const wxString &title, + const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); + ~wxFrame(); + bool Destroy(); + + // operations + // + virtual bool Show( bool show ); + virtual void Enable( bool enable ); + + // frame size + virtual void GetClientSize( int *width, int *height ) const; + // set minimal size for the frame (@@@ other params not implemented) + void SetSizeHints(int minW, int minH, + int maxW = -1, int maxH = -1, + int incW = -1); + + // status bar + virtual bool CreateStatusBar( int number = 1 ); + wxStatusBar *GetStatusBar(); + virtual void SetStatusText( const wxString &text, int number = 0 ); + virtual void SetStatusWidths( int n, int *width ); + + // menu bar + void SetMenuBar( wxMenuBar *menuBar ); + wxMenuBar *GetMenuBar(); + + // frame title + void SetTitle( const wxString &title ); + wxString GetTitle() const { return m_title; } - public: - - wxFrame(void); - wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); - bool Create( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); - ~wxFrame(void); - bool Destroy(void); - void OnCloseWindow( wxCloseEvent& event ); - virtual bool Show( bool show ); - virtual void Enable( bool enable ); - virtual void GetClientSize( int *width, int *height ) const; - void OnSize( wxSizeEvent &event ); - void SetMenuBar( wxMenuBar *menuBar ); - virtual bool CreateStatusBar( int number = 1 ); - virtual void SetStatusText( const wxString &text, int number = 0 ); - virtual void SetStatusWidths( int n, int *width ); - wxStatusBar *GetStatusBar(void); - wxMenuBar *GetMenuBar(void); - void SetTitle( const wxString &title ); - wxString GetTitle(void) const; - void OnActivate( wxActivateEvent &WXUNUSED(event) ) {}; - void OnIdle( wxIdleEvent &event ); - - //private: - - virtual void GtkOnSize( int x, int y, int width, int height ); - void DoMenuUpdates(void); - void DoMenuUpdates(wxMenu* menu); - - - private: - - friend wxWindow; - friend wxMDIChildFrame; - - wxMenuBar *m_frameMenuBar; - GtkWidget *m_mainWindow; - wxStatusBar *m_frameStatusBar; - bool m_doingOnSize; - wxString m_title; - - + // implementation + void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp + void OnSize( wxSizeEvent &event ); + void OnCloseWindow( wxCloseEvent& event ); + void OnIdle(wxIdleEvent& event); + + virtual void GtkOnSize( int x, int y, int width, int height ); + +private: + friend wxWindow; + friend wxMDIChildFrame; + + // update frame's menus (called from OnIdle) + void DoMenuUpdates(); + void DoMenuUpdates(wxMenu* menu); + + GtkWidget *m_mainWindow; + wxMenuBar *m_frameMenuBar; + wxStatusBar *m_frameStatusBar; + bool m_doingOnSize; + wxString m_title; + + DECLARE_DYNAMIC_CLASS(wxFrame) DECLARE_EVENT_TABLE() - }; #endif // __GTKFRAMEH__ -- 2.47.2