X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8487f8874288a8e4fe40ead153c73dfc7777f41b..a4e17da5463a1b1fae7d613b3ce66023cb8ea1d3:/include/wx/motif/frame.h diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index 1e932f95f3..e3e1e553ea 100644 --- a/include/wx/motif/frame.h +++ b/include/wx/motif/frame.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.h +// Name: wx/motif/frame.h // Purpose: wxFrame class // Author: Julian Smart // Modified by: @@ -9,30 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_FRAME_H_ -#define _WX_FRAME_H_ +#ifndef _WX_MOTIF_FRAME_H_ +#define _WX_MOTIF_FRAME_H_ #ifdef __GNUG__ -#pragma interface "frame.h" + #pragma interface "frame.h" #endif -#include "wx/window.h" -#include "wx/toolbar.h" -#include "wx/accel.h" -#include "wx/icon.h" - -WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; - -class WXDLLEXPORT wxMenuBar; -class WXDLLEXPORT wxStatusBar; - -class WXDLLEXPORT wxFrame : public wxWindow +class WXDLLEXPORT wxFrame : public wxFrameBase { -DECLARE_DYNAMIC_CLASS(wxFrame) - public: - wxFrame(); + wxFrame() { Init(); } wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, @@ -41,126 +28,75 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr) { + Init(); + Create(parent, id, title, pos, size, style, name); } - ~wxFrame(); - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr); - virtual bool Destroy(); + virtual ~wxFrame(); - void ClientToScreen(int *x, int *y) const; - wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); } - - void ScreenToClient(int *x, int *y) const; - wxPoint ScreenToClient(const wxPoint& pt) const { return wxWindow::ScreenToClient(pt); } - - void OnSize(wxSizeEvent& event); - void OnMenuHighlight(wxMenuEvent& event); - void OnActivate(wxActivateEvent& event); - void OnIdle(wxIdleEvent& event); - void OnCloseWindow(wxCloseEvent& event); - - bool Show(bool show); + virtual bool Show(bool show = TRUE); // Set menu bar void SetMenuBar(wxMenuBar *menu_bar); - virtual wxMenuBar *GetMenuBar() const ; // Set title void SetTitle(const wxString& title); wxString GetTitle() const { return m_title; } - virtual bool IsTopLevel() const { return TRUE; } - - void Centre(int direction = wxBOTH); - - // Call this to simulate a menu command - virtual void Command(int id); - virtual void ProcessCommand(int id); - // Set icon virtual void SetIcon(const wxIcon& icon); - // Create status line - virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, - const wxString& name = "statusBar"); - wxStatusBar *GetStatusBar() const { return m_frameStatusBar; } +#if wxUSE_STATUSBAR virtual void PositionStatusBar(); - virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id, - const wxString& name); +#endif // wxUSE_STATUSBAR // Create toolbar #if wxUSE_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 void SetToolBar(wxToolBar *toolbar) ; - virtual wxToolBar *GetToolBar() const ; virtual void PositionToolBar(); #endif // wxUSE_TOOLBAR - // Set status line text - virtual void SetStatusText(const wxString& text, int number = 0); - - // Set status line widths - 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? - static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; }; - static bool UsesNativeStatusBar() { return m_useNativeStatusBar; }; - - // Fit frame around subwindows - virtual void Fit(); - // Iconize virtual void Iconize(bool iconize); - virtual bool IsIconized() const ; - - // Compatibility - bool Iconized() const { return IsIconized(); } + virtual bool IsIconized() const; // Is the frame maximized? Returns FALSE under Motif (but TRUE for // wxMDIChildFrame due to the tabbed implementation). - virtual bool IsMaximized(void) const ; + virtual bool IsMaximized() const; virtual void Maximize(bool maximize); - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // Query app for menu item updates (called from OnIdle) - void DoMenuUpdates(); - void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); - - // Checks if there is a toolbar, and returns the first free client position - virtual wxPoint GetClientAreaOrigin() const; - virtual void Raise(); virtual void Lower(); - virtual void CaptureMouse(); - virtual void ReleaseMouse(); + virtual void Restore(); + + // Implementation only from now on + // ------------------------------- + + void OnSysColourChanged(wxSysColourChangedEvent& event); + void OnActivate(wxActivateEvent& event); - // Implementation virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); - WXWidget GetMenuBarWidget() const ; + WXWidget GetMenuBarWidget() const; WXWidget GetShellWidget() const { return m_frameShell; } WXWidget GetWorkAreaWidget() const { return m_workArea; } WXWidget GetClientAreaWidget() const { return m_clientArea; } WXWidget GetTopWidget() const { return m_frameShell; } - WXWidget GetMainWindowWidget() const { return m_frameWidget; } + + virtual WXWidget GetMainWidget() const { return m_frameWidget; } // The widget that can have children on it WXWidget GetClientWidget() const; @@ -169,40 +105,30 @@ public: bool PreResize(); protected: - void DoGetClientSize(int *width, int *height) const; - void DoGetSize(int *width, int *height) const ; - void DoGetPosition(int *x, int *y) const ; - -protected: - wxMenuBar * m_frameMenuBar; - wxStatusBar * m_frameStatusBar; - wxIcon m_icon; - bool m_iconized; - static bool m_useNativeStatusBar; - -#if wxUSE_TOOLBAR - wxToolBar * m_frameToolBar ; -#endif // wxUSE_TOOLBAR + // common part of all ctors + void Init(); //// Motif-specific - WXWidget m_frameShell; WXWidget m_frameWidget; WXWidget m_workArea; WXWidget m_clientArea; - // WXWidget m_menuBarWidget; - bool m_visibleStatus; wxString m_title; + bool m_visibleStatus; + bool m_iconized; + virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetPosition(int *x, int *y) const; virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); private: DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxFrame) }; #endif - // _WX_FRAME_H_ + // _WX_MOTIF_FRAME_H_