X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6522713c7527e5f683a107dff8f40e3ea19a4745..1de4baa31f17548b32a376a71ce50fee6a3e759c:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 5e5d7aabe5..2af6cd1d8d 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -16,12 +16,11 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "framebase.h" #endif -#include "wx/window.h" // the base class -#include "wx/icon.h" // for m_icon +#include "wx/toplevel.h" // the base class // the default names for various classs WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; @@ -33,14 +32,6 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxToolBar; -// Styles for ShowFullScreen -#define wxFULLSCREEN_NOMENUBAR 0x01 -#define wxFULLSCREEN_NOTOOLBAR 0x02 -#define wxFULLSCREEN_NOSTATUSBAR 0x04 -#define wxFULLSCREEN_NOBORDER 0x08 -#define wxFULLSCREEN_NOCAPTION 0x10 -#define wxFULLSCREEN_ALL (wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION) - // ---------------------------------------------------------------------------- // wxFrame is a top-level window with optional menubar, statusbar and toolbar // @@ -53,14 +44,17 @@ class WXDLLEXPORT wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrameBase : public wxWindow +// FIXME - temporary hack in absence of wxTLW !! +#ifndef wxTopLevelWindowNative +class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase +#else +class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow +#endif { public: // construction wxFrameBase(); -#ifdef __WXMAC_X__ - virtual ~wxFrameBase() {} // Added min for Mac X -#endif + virtual ~wxFrameBase(); wxFrame *New(wxWindow *parent, wxWindowID id, @@ -73,34 +67,17 @@ public: // frame state // ----------- - // maximize = TRUE => maximize, otherwise - restore - virtual void Maximize(bool maximize = TRUE) = 0; - - // undo Maximize() or Iconize() - virtual void Restore() = 0; - - // iconize = TRUE => iconize, otherwise - restore - virtual void Iconize(bool iconize = TRUE) = 0; - - // return TRUE if the frame is maximized - virtual bool IsMaximized() const = 0; - - // return TRUE if the frame is iconized - virtual bool IsIconized() const = 0; - - // get the frame icon - const wxIcon& GetIcon() const { return m_icon; } - - // set the frame icon - virtual void SetIcon(const wxIcon& icon) { m_icon = icon; } - - // make the window modal (all other windows unresponsive) - virtual void MakeModal(bool modal = TRUE); - // get the origin of the client area (which may be different from (0, 0) // if the frame has a toolbar) in client coordinates virtual wxPoint GetClientAreaOrigin() const; + // sends a size event to the window using its current size -- this has an + // effect of refreshing the window layout + // + // currently it is only implemented under MSW but is declared here to make + // it possible to call it in portable code without using #ifdef's + virtual void SendSizeEvent() { } + // menu bar functions // ------------------ @@ -138,6 +115,12 @@ public: // forward these to status bar virtual void SetStatusText(const wxString &text, int number = 0); virtual void SetStatusWidths(int n, const int widths_field[]); + void PushStatusText(const wxString &text, int number = 0); + void PopStatusText(int number = 0); + + // set the status bar pane the help will be shown in + void SetStatusBarPane(int n) { m_statusBarPane = n; } + int GetStatusBarPane() const { return m_statusBarPane; } #endif // wxUSE_STATUSBAR // toolbar functions @@ -157,27 +140,12 @@ public: virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; } #endif // wxUSE_TOOLBAR - // old functions, use the new ones instead! -#if WXWIN_COMPATIBILITY_2 - bool Iconized() const { return IsIconized(); } -#endif // WXWIN_COMPATIBILITY_2 - // implementation only from now on // ------------------------------- - // override some base class virtuals - virtual bool Destroy(); - virtual bool IsTopLevel() const { return TRUE; } - // event handlers void OnIdle(wxIdleEvent& event); - void OnCloseWindow(wxCloseEvent& event); void OnMenuHighlight(wxMenuEvent& event); - void OnSize(wxSizeEvent& event); - - // this should go away, but for now it's called from docview.cpp, - // so should be there for all platforms - void OnActivate(wxActivateEvent &WXUNUSED(event)) { } #if wxUSE_MENUS // send wxUpdateUIEvents for all menu items (called from OnIdle()) @@ -185,6 +153,21 @@ public: void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); #endif // wxUSE_MENUS + // if there is no real wxTopLevelWindow on this platform we have to define + // some wxTopLevelWindowBase pure virtual functions here to avoid breaking + // old ports (wxMotif) which don't define them in wxFrame +#ifndef wxTopLevelWindowNative + virtual bool ShowFullScreen(bool WXUNUSED(show), + long WXUNUSED(style) = wxFULLSCREEN_ALL) + { return FALSE; } + virtual bool IsFullScreen() const + { return FALSE; } +#endif // no wxTopLevelWindowNative + + // show help text (typically in the statusbar); show is FALSE + // if you are hiding the help, TRUE otherwise + virtual void DoGiveHelp(const wxString& text, bool show); + protected: // the frame main menu/status/tool bars // ------------------------------------ @@ -223,6 +206,9 @@ protected: wxStatusBar *m_frameStatusBar; #endif // wxUSE_STATUSBAR + + int m_statusBarPane; + #if wxUSE_TOOLBAR // override to update status bar position (or anything else) when // something changes @@ -231,65 +217,25 @@ protected: wxToolBar *m_frameToolBar; #endif // wxUSE_TOOLBAR - // the frame client to screen translation should take account of the - // toolbar which may shift the origin of the client area - virtual void DoClientToScreen(int *x, int *y) const; - virtual void DoScreenToClient(int *x, int *y) const; - - // send the iconize event, return TRUE if processed - bool SendIconizeEvent(bool iconized = TRUE); - - // the frame icon - wxIcon m_icon; - DECLARE_EVENT_TABLE() }; // include the real class declaration -#if defined(__WXMSW__) - #include "wx/msw/frame.h" - #define wxFrameNative wxFrameMSW -#elif defined(__WXGTK__) - #include "wx/gtk/frame.h" - #define wxFrameNative wxFrameGTK -#elif defined(__WXMOTIF__) - #include "wx/motif/frame.h" -#elif defined(__WXMAC__) - #include "wx/mac/frame.h" - #define wxFrameNative wxFrameMac -#elif defined(__WXMGL__) - #include "wx/mgl/frame.h" - #define wxFrameNative wxFrameMGL -#elif defined(__WXPM__) - #include "wx/os2/frame.h" - #define wxFrameNative wxFrameOS2 -#endif - -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ - #ifdef wxFrameNative - class WXDLLEXPORT wxFrame : public wxFrameNative - { - public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - Create(parent, id, title, pos, size, style, name); - } - - DECLARE_DYNAMIC_CLASS(wxFrame) - }; - #endif // wxFrameNative -#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__ + #if defined(__WXMSW__) + #include "wx/msw/frame.h" + #elif defined(__WXGTK__) + #include "wx/gtk/frame.h" + #elif defined(__WXMOTIF__) + #include "wx/motif/frame.h" + #elif defined(__WXMAC__) + #include "wx/mac/frame.h" + #elif defined(__WXPM__) + #include "wx/os2/frame.h" + #endif +#endif #endif // _WX_FRAME_H_BASE_