// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifndef __FRAMEH__
-#define __FRAMEH__
+#ifndef _WX_FRAME_H_
+#define _WX_FRAME_H_
#ifdef __GNUG__
#pragma interface "frame.h"
#endif
#include "wx/window.h"
+#include "wx/toolbar.h"
+#include "wx/msw/accel.h"
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
public:
wxFrame(void);
inline wxFrame(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE,
+ long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
~wxFrame(void);
bool Create(wxWindow *parent,
- const wxWindowID id,
+ wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- const long style = wxDEFAULT_FRAME_STYLE,
+ long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
-#if WXWIN_COMPATIBILITY
- // The default thing is to set the focus for the first child window.
- // Override for your own behaviour.
- virtual void OldOnActivate(bool flag);
-
- // Default behaviour is to display a help string for the menu item.
- virtual void OldOnMenuSelect(int id);
-
- inline virtual void OldOnMenuCommand(int WXUNUSED(id)) {}; // Called on frame menu command
- void OldOnSize(int x, int y);
-#endif
-
virtual bool Destroy(void);
- void SetClientSize(const int width, const int height);
+ void SetClientSize(int width, int height);
void GetClientSize(int *width, int *height) const;
void GetSize(int *width, int *height) const ;
void GetPosition(int *x, int *y) const ;
- void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+ void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+
+ virtual bool OnClose(void);
void OnSize(wxSizeEvent& event);
void OnMenuHighlight(wxMenuEvent& event);
void OnIdle(wxIdleEvent& event);
void OnCloseWindow(wxCloseEvent& event);
- bool Show(const bool show);
+ bool Show(bool show);
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
void SetTitle(const wxString& title);
wxString GetTitle(void) const ;
- void Centre(const int direction = wxBOTH);
+ void Centre(int direction = wxBOTH);
// Call this to simulate a menu command
virtual void Command(int id);
virtual void SetIcon(const wxIcon& icon);
// Create status line
- virtual bool CreateStatusBar(const 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, const int number = 0);
+ virtual void SetStatusText(const wxString& text, int number = 0);
// Set status line widths
- virtual void SetStatusWidths(const int n, const int *widths_field);
+ virtual void SetStatusWidths(int n, const int widths_field[]);
// Hint to tell framework which status bar to use
// TODO: should this go into a wxFrameworkSettings class perhaps?
virtual void Fit(void);
// Iconize
- virtual void Iconize(const bool iconize);
+ virtual void Iconize(bool iconize);
virtual bool IsIconized(void) const ;
// Compatibility
inline bool Iconized(void) const { return IsIconized(); }
- virtual void Maximize(const bool maximize);
- virtual bool LoadAccelerators(const wxString& table);
+ virtual void Maximize(bool maximize);
+// virtual bool LoadAccelerators(const wxString& table);
- virtual void PositionStatusBar(void);
- virtual wxStatusBar *OnCreateStatusBar(const int number);
+ // Responds to colour changes
+ void OnSysColourChanged(wxSysColourChangedEvent& event);
// Query app for menu item updates (called from OnIdle)
void DoMenuUpdates(void);
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);
WXHICON MSWOnQueryDragIcon(void);
- void MSWOnSize(const int x, const int y, const WXUINT flag);
- bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control);
+ void MSWOnSize(int x, int y, WXUINT flag);
+ bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool MSWOnClose(void);
- void MSWOnMenuHighlight(const WXWORD item, const WXWORD flags, const WXHMENU sysmenu);
+ void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
bool MSWProcessMessage(WXMSG *msg);
- void MSWCreate(const int id, wxWindow *parent, const char *WXUNUSED(wclass), wxWindow *wx_win, const char *title,
- const int x, const int y, const int width, const int height, const long style);
+ bool MSWTranslateMessage(WXMSG *msg);
+ void MSWCreate(int id, wxWindow *parent, const char *WXUNUSED(wclass), wxWindow *wx_win, const char *title,
+ int x, int y, int width, int height, long style);
protected:
+ // propagate our state change to all child frames
+ void IconizeChildFrames(bool bIconize);
+
wxMenuBar * m_frameMenuBar;
wxStatusBar * m_frameStatusBar;
wxIcon m_icon;
bool m_iconized;
WXHICON m_defaultIcon;
static bool m_useNativeStatusBar;
+ wxToolBar * m_frameToolBar ;
DECLARE_EVENT_TABLE()
};
#endif
- // __FRAMEH__
+ // _WX_FRAME_H_
projects / wxWidgets.git / blobdiff