X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a62848fdba49396eba4f52c037d2dc82130274b4..ababa106ae015f05e14cd2487100954ef50ca694:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 053f50f07d..9b857d9f4b 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -78,10 +78,7 @@ public: // 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() { } + virtual void SendSizeEvent(); // menu bar functions // ------------------ @@ -112,8 +109,7 @@ public: virtual wxStatusBar *GetStatusBar() const { return m_frameStatusBar; } // sets the main status bar - void SetStatusBar(wxStatusBar *statBar) - { m_frameStatusBar = statBar; PositionStatusBar(); } + virtual void SetStatusBar(wxStatusBar *statBar); // forward these to status bar virtual void SetStatusText(const wxString &text, int number = 0); @@ -141,7 +137,7 @@ public: // get/set the main toolbar virtual wxToolBar *GetToolBar() const { return m_frameToolBar; } - virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; } + virtual void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR // implementation only from now on @@ -251,7 +247,9 @@ protected: #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ - #if defined(__WXMSW__) + #if defined(__PALMOS__) + #include "wx/palmos/frame.h" + #elif defined(__WXMSW__) #include "wx/msw/frame.h" #elif defined(__WXGTK__) #include "wx/gtk/frame.h"