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

wxToolBar API changes; now frames manage their toolbar & statusbar properly;

Browse Source 
client area position is used in SetSize; changes for BC++ & VC++ 1.5;
wxWindow::GetUpdateRegion added; removed wxUpdateIterator; some missing functions
added to process.cpp; bad navigation key event cast fixed; MDI and toolbar samples
updated; new wxMSW wxRegion constructor (WXHRGN)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-27 09:47:57 +00:00
parent e6688c3fd2
commit 81d66cf39f
57 changed files with 1372 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/msw/frame.h
View File

@@ -17,8 +17,10 @@
#endif
#include "wx/window.h"
#include "wx/toolbar.h"
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
@@ -58,10 +60,6 @@ public:
void GetPosition(int *x, int *y) const ;
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
// Toolbar: if made known to the frame, the frame will manage it automatically.
virtual inline void SetToolBar(wxWindow *toolbar) { m_frameToolBar = toolbar; }
virtual inline wxWindow *GetToolBar(void) const { return m_frameToolBar; }
virtual bool OnClose(void);
void OnSize(wxSizeEvent& event);
@@ -90,8 +88,20 @@ public:
virtual void SetIcon(const wxIcon& icon);
// Create status line
virtual bool CreateStatusBar(int number=1);
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = "statusBar");
inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
virtual void PositionStatusBar(void);
virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name);
// Create toolbar
virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
// If made known to the frame, the frame will manage it automatically.
virtual inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
virtual inline wxToolBar *GetToolBar(void) const { return m_frameToolBar; }
virtual void PositionToolBar(void);
// Set status line text
virtual void SetStatusText(const wxString& text, int number = 0);
@@ -118,8 +128,8 @@ public:
virtual void Maximize(bool maximize);
virtual bool LoadAccelerators(const wxString& table);
virtual void PositionStatusBar(void);
virtual wxStatusBar *OnCreateStatusBar(int number);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Query app for menu item updates (called from OnIdle)
void DoMenuUpdates(void);
@@ -127,8 +137,8 @@ public:
WXHMENU GetWinMenu(void) const ;
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Checks if there is a toolbar, and returns the first free client position
virtual wxPoint GetClientAreaOrigin() const;
// Handlers
bool MSWOnPaint(void);
@@ -148,7 +158,7 @@ protected:
bool m_iconized;
WXHICON m_defaultIcon;
static bool m_useNativeStatusBar;
wxWindow * m_frameToolBar ;
wxToolBar * m_frameToolBar ;
DECLARE_EVENT_TABLE()
};