Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMDIChildFrame inherits from wxFrame

Browse Source 
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:
Robert Roebling
1998-07-29 13:21:22 +00:00
parent da468d387d
commit cf4219e77a
17 changed files with 228 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/docview.h
View File

@@ -157,9 +157,6 @@ class WXDLLEXPORT wxView: public wxEvtHandler
inline wxFrame *GetFrame(void) const { return m_viewFrame ; }
inline void SetFrame(wxFrame *frame) { m_viewFrame = frame; }
#ifdef __WXGTK__
inline void SetFrame(wxMDIChildFrame *frame) { m_viewFrame = (wxFrame*)frame; }
#endif
virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
virtual void OnDraw(wxDC *dc) = 0;

17
include/wx/gtk/frame.h
View File

@@ -19,15 +19,17 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxMDIChildFrame;
class wxMDIClientWindow;
class wxMenu;
class wxMenuBar;
class wxToolBar;
class wxStatusBar;
class wxFrame;
@@ -36,6 +38,7 @@ class wxFrame;
//-----------------------------------------------------------------------------
extern const char *wxFrameNameStr;
extern const char *wxToolBarNameStr;
//-----------------------------------------------------------------------------
// wxFrame
@@ -77,10 +80,10 @@ public:
virtual void SetMenuBar( wxMenuBar *menuBar );
virtual wxMenuBar *GetMenuBar();
void SetTitle( const wxString &title );
wxString GetTitle() const { return m_title; }
virtual void SetTitle( const wxString &title );
virtual wxString GetTitle() const { return m_title; }
void SetIcon( const wxIcon &icon );
virtual void SetIcon( const wxIcon &icon );
void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
@@ -93,6 +96,7 @@ public:
private:
friend wxWindow;
friend wxMDIChildFrame;
friend wxMDIClientWindow;
// update frame's menus (called from OnIdle)
void DoMenuUpdates();
@@ -103,7 +107,6 @@ private:
wxStatusBar *m_frameStatusBar;
wxToolBar *m_frameToolBar;
int m_toolBarHeight;
bool m_doingOnSize;
bool m_addPrivateChild; // for toolbar (and maybe menubar)
wxString m_title;
wxIcon m_icon;

47
include/wx/gtk/mdi.h
View File

@@ -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:

1
include/wx/gtk/tbargtk.h
View File

@@ -117,7 +117,6 @@ class wxToolBar: public wxControl
virtual void EnableTool(int toolIndex, bool enable);
virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
virtual wxObject *GetToolClientData(int index) const;
virtual bool GetToolState(int toolIndex) const;

17
include/wx/gtk1/frame.h
View File

@@ -19,15 +19,17 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxMDIChildFrame;
class wxMDIClientWindow;
class wxMenu;
class wxMenuBar;
class wxToolBar;
class wxStatusBar;
class wxFrame;
@@ -36,6 +38,7 @@ class wxFrame;
//-----------------------------------------------------------------------------
extern const char *wxFrameNameStr;
extern const char *wxToolBarNameStr;
//-----------------------------------------------------------------------------
// wxFrame
@@ -77,10 +80,10 @@ public:
virtual void SetMenuBar( wxMenuBar *menuBar );
virtual wxMenuBar *GetMenuBar();
void SetTitle( const wxString &title );
wxString GetTitle() const { return m_title; }
virtual void SetTitle( const wxString &title );
virtual wxString GetTitle() const { return m_title; }
void SetIcon( const wxIcon &icon );
virtual void SetIcon( const wxIcon &icon );
void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
@@ -93,6 +96,7 @@ public:
private:
friend wxWindow;
friend wxMDIChildFrame;
friend wxMDIClientWindow;
// update frame's menus (called from OnIdle)
void DoMenuUpdates();
@@ -103,7 +107,6 @@ private:
wxStatusBar *m_frameStatusBar;
wxToolBar *m_frameToolBar;
int m_toolBarHeight;
bool m_doingOnSize;
bool m_addPrivateChild; // for toolbar (and maybe menubar)
wxString m_title;
wxIcon m_icon;

47
include/wx/gtk1/mdi.h
View File

@@ -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:

1
include/wx/gtk1/tbargtk.h
View File

@@ -117,7 +117,6 @@ class wxToolBar: public wxControl
virtual void EnableTool(int toolIndex, bool enable);
virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
virtual wxObject *GetToolClientData(int index) const;
virtual bool GetToolState(int toolIndex) const;