wxMDIChildFrame inherits from wxFrame
toolbar work mini menubar change compile fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,7 +100,7 @@ class wxMDIParentFrame: public wxFrame
|
||||
// wxMDIChildFrame
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxMDIChildFrame: public wxPanel
|
||||
class wxMDIChildFrame: public wxFrame
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
|
||||
|
||||
@@ -116,25 +116,46 @@ class wxMDIChildFrame: public wxPanel
|
||||
wxWindowID id, const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
|
||||
void SetMenuBar( wxMenuBar *menu_bar );
|
||||
|
||||
virtual void SetMenuBar( wxMenuBar *menu_bar );
|
||||
virtual wxMenuBar *GetMenuBar();
|
||||
|
||||
// no status bars in wxGTK
|
||||
virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
|
||||
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
|
||||
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
virtual void AddChild( wxWindow *child );
|
||||
|
||||
virtual void Maximize(void) {};
|
||||
virtual void Restore(void) {};
|
||||
virtual void Activate(void);
|
||||
virtual void Activate(void);
|
||||
|
||||
// no status bars
|
||||
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number), long WXUNUSED(style),
|
||||
wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) {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) ) {}
|
||||
|
||||
// no size hints
|
||||
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
|
||||
int WXUNUSED(maxH), int WXUNUSED(incW) ) {}
|
||||
|
||||
// no toolbar bars
|
||||
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),
|
||||
const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
|
||||
virtual wxToolBar *GetToolBar() { return (wxToolBar*)NULL; }
|
||||
|
||||
// no icon
|
||||
void SetIcon( const wxIcon &icon ) { m_icon = icon; }
|
||||
|
||||
// no title
|
||||
void SetTitle( const wxString &title ) { m_title = title; }
|
||||
wxString GetTitle() const { return m_title; }
|
||||
|
||||
// no maximize etc
|
||||
virtual void Maximize(void) {}
|
||||
virtual void Restore(void) {}
|
||||
|
||||
bool Destroy(void);
|
||||
void OnCloseWindow( wxCloseEvent& event );
|
||||
void OnSize( wxSizeEvent &event );
|
||||
void OnActivate( wxActivateEvent &event );
|
||||
|
||||
public:
|
||||
|
||||
wxString m_title;
|
||||
wxMenuBar *m_menuBar;
|
||||
|
||||
// private:
|
||||
|
Reference in New Issue
Block a user