DoMenuUpdates()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-07-23 16:06:23 +00:00
parent 4632781333
commit ab16f4a300
2 changed files with 122 additions and 98 deletions

View File

@ -5,7 +5,7 @@
// Created: 01/02/97 // Created: 01/02/97
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // 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 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();
public: // operations
//
wxFrame(void); virtual bool Show( bool show );
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, virtual void Enable( bool enable );
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); // frame size
bool Create( wxWindow *parent, wxWindowID id, const wxString &title, virtual void GetClientSize( int *width, int *height ) const;
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, // set minimal size for the frame (@@@ other params not implemented)
long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); void SetSizeHints(int minW, int minH,
~wxFrame(void); int maxW = -1, int maxH = -1,
bool Destroy(void); int incW = -1);
void OnCloseWindow( wxCloseEvent& event );
virtual bool Show( bool show ); // status bar
virtual void Enable( bool enable ); virtual bool CreateStatusBar( int number = 1 );
virtual void GetClientSize( int *width, int *height ) const; wxStatusBar *GetStatusBar();
void OnSize( wxSizeEvent &event ); virtual void SetStatusText( const wxString &text, int number = 0 );
void SetMenuBar( wxMenuBar *menuBar ); virtual void SetStatusWidths( int n, int *width );
virtual bool CreateStatusBar( int number = 1 );
virtual void SetStatusText( const wxString &text, int number = 0 ); // menu bar
virtual void SetStatusWidths( int n, int *width ); void SetMenuBar( wxMenuBar *menuBar );
wxStatusBar *GetStatusBar(void); wxMenuBar *GetMenuBar();
wxMenuBar *GetMenuBar(void);
void SetTitle( const wxString &title ); // frame title
wxString GetTitle(void) const; void SetTitle( const wxString &title );
void OnActivate( wxActivateEvent &WXUNUSED(event) ) {}; wxString GetTitle() const { return m_title; }
void OnIdle( wxIdleEvent &event );
// implementation
//private: void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
virtual void GtkOnSize( int x, int y, int width, int height ); void OnCloseWindow( wxCloseEvent& event );
void DoMenuUpdates(void); void OnIdle(wxIdleEvent& event);
void DoMenuUpdates(wxMenu* menu);
virtual void GtkOnSize( int x, int y, int width, int height );
private: private:
friend wxWindow;
friend wxWindow; friend wxMDIChildFrame;
friend wxMDIChildFrame;
// update frame's menus (called from OnIdle)
wxMenuBar *m_frameMenuBar; void DoMenuUpdates();
GtkWidget *m_mainWindow; void DoMenuUpdates(wxMenu* menu);
wxStatusBar *m_frameStatusBar;
bool m_doingOnSize; GtkWidget *m_mainWindow;
wxString m_title; wxMenuBar *m_frameMenuBar;
wxStatusBar *m_frameStatusBar;
bool m_doingOnSize;
wxString m_title;
DECLARE_DYNAMIC_CLASS(wxFrame)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // __GTKFRAMEH__ #endif // __GTKFRAMEH__

View File

@ -5,7 +5,7 @@
// Created: 01/02/97 // Created: 01/02/97
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // 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 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();
public: // operations
//
wxFrame(void); virtual bool Show( bool show );
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, virtual void Enable( bool enable );
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); // frame size
bool Create( wxWindow *parent, wxWindowID id, const wxString &title, virtual void GetClientSize( int *width, int *height ) const;
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, // set minimal size for the frame (@@@ other params not implemented)
long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); void SetSizeHints(int minW, int minH,
~wxFrame(void); int maxW = -1, int maxH = -1,
bool Destroy(void); int incW = -1);
void OnCloseWindow( wxCloseEvent& event );
virtual bool Show( bool show ); // status bar
virtual void Enable( bool enable ); virtual bool CreateStatusBar( int number = 1 );
virtual void GetClientSize( int *width, int *height ) const; wxStatusBar *GetStatusBar();
void OnSize( wxSizeEvent &event ); virtual void SetStatusText( const wxString &text, int number = 0 );
void SetMenuBar( wxMenuBar *menuBar ); virtual void SetStatusWidths( int n, int *width );
virtual bool CreateStatusBar( int number = 1 );
virtual void SetStatusText( const wxString &text, int number = 0 ); // menu bar
virtual void SetStatusWidths( int n, int *width ); void SetMenuBar( wxMenuBar *menuBar );
wxStatusBar *GetStatusBar(void); wxMenuBar *GetMenuBar();
wxMenuBar *GetMenuBar(void);
void SetTitle( const wxString &title ); // frame title
wxString GetTitle(void) const; void SetTitle( const wxString &title );
void OnActivate( wxActivateEvent &WXUNUSED(event) ) {}; wxString GetTitle() const { return m_title; }
void OnIdle( wxIdleEvent &event );
// implementation
//private: void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
virtual void GtkOnSize( int x, int y, int width, int height ); void OnCloseWindow( wxCloseEvent& event );
void DoMenuUpdates(void); void OnIdle(wxIdleEvent& event);
void DoMenuUpdates(wxMenu* menu);
virtual void GtkOnSize( int x, int y, int width, int height );
private: private:
friend wxWindow;
friend wxWindow; friend wxMDIChildFrame;
friend wxMDIChildFrame;
// update frame's menus (called from OnIdle)
wxMenuBar *m_frameMenuBar; void DoMenuUpdates();
GtkWidget *m_mainWindow; void DoMenuUpdates(wxMenu* menu);
wxStatusBar *m_frameStatusBar;
bool m_doingOnSize; GtkWidget *m_mainWindow;
wxString m_title; wxMenuBar *m_frameMenuBar;
wxStatusBar *m_frameStatusBar;
bool m_doingOnSize;
wxString m_title;
DECLARE_DYNAMIC_CLASS(wxFrame)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // __GTKFRAMEH__ #endif // __GTKFRAMEH__