X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..19c4d91638c2546630c4427e39c02f5380a8bb87:/include/wx/palmos/frame.h?ds=sidebyside diff --git a/include/wx/palmos/frame.h b/include/wx/palmos/frame.h index fab8f6c8a5..9f1d190bf4 100644 --- a/include/wx/palmos/frame.h +++ b/include/wx/palmos/frame.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/frame.h // Purpose: wxFrame class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "frame.h" -#endif - class WXDLLEXPORT wxFrame : public wxFrameBase { public: @@ -52,63 +48,27 @@ public: // ------------------------------- // event handlers - void OnSysColourChanged(wxSysColourChangedEvent& event); - void OnPaint(wxPaintEvent& event); + void OnPaint(wxPaintEvent& event); // Toolbar #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); virtual void PositionToolBar(); #endif // wxUSE_TOOLBAR - // Status bar -#if wxUSE_STATUSBAR - virtual wxStatusBar* OnCreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); - - virtual void PositionStatusBar(); - - // Hint to tell framework which status bar to use: the default is to use - // native one for the platforms which support it (Win32), the generic one - // otherwise - - // TODO: should this go into a wxFrameworkSettings class perhaps? - static void UseNativeStatusBar(bool useNative) - { m_useNativeStatusBar = useNative; }; - static bool UsesNativeStatusBar() - { return m_useNativeStatusBar; }; -#endif // wxUSE_STATUSBAR - - WXHMENU GetWinMenu() const { return m_hMenu; } - // event handlers - bool HandlePaint(); - bool HandleSize(int x, int y, WXUINT flag); - bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup); - // tooltip management -#if wxUSE_TOOLTIPS - WXHWND GetToolTipCtrl() const { return m_hwndToolTip; } - void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; } -#endif // tooltips - - // a MSW only function which sends a size event to the window using its - // current size - this has an effect of refreshing the window layout - virtual void SendSizeEvent(); - virtual wxPoint GetClientAreaOrigin() const; #if wxUSE_MENUS_NATIVE bool HandleMenuOpen(); - bool HandleMenuSelect(int ItemID); + bool HandleMenuSelect(WXEVENTPTR event); #endif // wxUSE_MENUS_NATIVE - + protected: // common part of all ctors void Init(); @@ -118,9 +78,6 @@ protected: virtual void DoSetClientSize(int width, int height); #if wxUSE_MENUS_NATIVE - // perform MSW-specific action when menubar is changed - virtual void AttachMenuBar(wxMenuBar *menubar); - // a plug in for MDI frame classes which need to do something special when // the menubar is set virtual void InternalSetMenuBar(); @@ -129,24 +86,7 @@ protected: // propagate our state change to all child frames void IconizeChildFrames(bool bIconize); - // we add menu bar accel processing - bool MSWTranslateMessage(WXMSG* pMsg); - - // window proc for the frames - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - - // handle WM_INITMENUPOPUP message - bool HandleInitMenuPopup(WXHMENU hMenu); - - virtual bool IsMDIChild() const { return FALSE; } - - // get default (wxWidgets) icon for the frame - virtual WXHICON GetDefaultIcon() const; - -#if wxUSE_STATUSBAR - static bool m_useNativeStatusBar; - wxStatusBar *StatusBar; -#endif // wxUSE_STATUSBAR + virtual bool IsMDIChild() const { return false; } // Data to save/restore when calling ShowFullScreen int m_fsStatusBarFields; // 0 for no status bar @@ -154,13 +94,9 @@ protected: int m_fsToolBarHeight; private: -#if wxUSE_TOOLTIPS - WXHWND m_hwndToolTip; -#endif // tooltips - // used by IconizeChildFrames(), see comments there bool m_wasMinimized; - + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame) };