projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed GetColHeader() to GetGridColHeader() for consistency with the other existing...
[wxWidgets.git]
/
include
/
wx
/
aui
/
tabmdi.h
diff --git
a/include/wx/aui/tabmdi.h
b/include/wx/aui/tabmdi.h
index cf0d4b9a591bf991d12541ab079e1e116af21e38..1084829cf0eb7fd3c0da4e50e552edb3207c6216 100644
(file)
--- a/
include/wx/aui/tabmdi.h
+++ b/
include/wx/aui/tabmdi.h
@@
-21,15
+21,16
@@
#include "wx/frame.h"
#include "wx/panel.h"
#include "wx/notebook.h"
#include "wx/frame.h"
#include "wx/panel.h"
#include "wx/notebook.h"
+#include "wx/icon.h"
#include "wx/aui/auibook.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
#include "wx/aui/auibook.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
-class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
-class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;
+class WXDLLIMPEXP_
FWD_
AUI wxAuiMDIParentFrame;
+class WXDLLIMPEXP_
FWD_
AUI wxAuiMDIClientWindow;
+class WXDLLIMPEXP_
FWD_
AUI wxAuiMDIChildFrame;
//-----------------------------------------------------------------------------
// wxAuiMDIParentFrame
//-----------------------------------------------------------------------------
// wxAuiMDIParentFrame
@@
-62,7
+63,7
@@
public:
wxAuiNotebook* GetNotebook() const;
#if wxUSE_MENUS
wxAuiNotebook* GetNotebook() const;
#if wxUSE_MENUS
- wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
;
+ wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
void SetWindowMenu(wxMenu* pMenu);
virtual void SetMenuBar(wxMenuBar *pMenuBar);
void SetWindowMenu(wxMenu* pMenu);
virtual void SetMenuBar(wxMenuBar *pMenuBar);
@@
-73,13
+74,13
@@
public:
virtual bool ProcessEvent(wxEvent& event);
wxAuiMDIChildFrame *GetActiveChild() const;
virtual bool ProcessEvent(wxEvent& event);
wxAuiMDIChildFrame *GetActiveChild() const;
-
inline
void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
+ void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
wxAuiMDIClientWindow *GetClientWindow() const;
virtual wxAuiMDIClientWindow *OnCreateClient();
virtual void Cascade() { /* Has no effect */ }
wxAuiMDIClientWindow *GetClientWindow() const;
virtual wxAuiMDIClientWindow *OnCreateClient();
virtual void Cascade() { /* Has no effect */ }
- virtual void Tile(wxOrientation
WXUNUSED(orient) = wxHORIZONTAL) { }
+ virtual void Tile(wxOrientation
orient = wxHORIZONTAL);
virtual void ArrangeIcons() { /* Has no effect */ }
virtual void ActivateNext();
virtual void ActivatePrevious();
virtual void ArrangeIcons() { /* Has no effect */ }
virtual void ActivateNext();
virtual void ActivatePrevious();
@@
-153,6
+154,8
@@
public:
virtual void Activate();
virtual bool Destroy();
virtual void Activate();
virtual bool Destroy();
+ virtual bool Show(bool show = true);
+
#if wxUSE_STATUSBAR
// no status bars
virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
#if wxUSE_STATUSBAR
// no status bars
virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
@@
-166,13
+169,6
@@
public:
virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
#endif
virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
#endif
- // no size hints
- virtual void DoSetSizeHints(int WXUNUSED(minW),
- int WXUNUSED(minH),
- int WXUNUSED(maxW) = wxDefaultCoord,
- int WXUNUSED(maxH) = wxDefaultCoord,
- int WXUNUSED(incW) = wxDefaultCoord,
- int WXUNUSED(incH) = wxDefaultCoord) {}
#if wxUSE_TOOLBAR
// no toolbar bars
virtual wxToolBar* CreateToolBar(long WXUNUSED(style),
#if wxUSE_TOOLBAR
// no toolbar bars
virtual wxToolBar* CreateToolBar(long WXUNUSED(style),
@@
-203,10
+199,13
@@
public:
protected:
void Init();
protected:
void Init();
- virtual bool Show(bool show = true);
virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
virtual void DoMoveWindow(int x, int y, int width, int height);
+ // no size hints
+ virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+ int WXUNUSED(maxW), int WXUNUSED(maxH),
+ int WXUNUSED(incW), int WXUNUSED(incH)) {}
public:
// This function needs to be called when a size change is confirmed,
// we needed this function to prevent anybody from the outside
public:
// This function needs to be called when a size change is confirmed,
// we needed this function to prevent anybody from the outside
@@
-221,6
+220,7
@@
protected:
wxString m_title;
wxIcon m_icon;
wxIconBundle m_icon_bundle;
wxString m_title;
wxIcon m_icon;
wxIconBundle m_icon_bundle;
+ bool m_activate_on_create;
#if wxUSE_MENUS
wxMenuBar* m_pMenuBar;
#if wxUSE_MENUS
wxMenuBar* m_pMenuBar;
@@
-254,7
+254,8
@@
public:
protected:
void PageChanged(int old_selection, int new_selection);
protected:
void PageChanged(int old_selection, int new_selection);
- void OnPageChanged(wxAuiNotebookEvent& event);
+ void OnPageClose(wxAuiNotebookEvent& evt);
+ void OnPageChanged(wxAuiNotebookEvent& evt);
void OnSize(wxSizeEvent& evt);
private:
void OnSize(wxSizeEvent& evt);
private: