X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1d63b79352db5290a9f86428d193bd6a08ef32f..fa629adae4b372620b2109777ec37c2deed24d58:/include/wx/palmos/frame.h diff --git a/include/wx/palmos/frame.h b/include/wx/palmos/frame.h index 93d890664c..ed9166a712 100644 --- a/include/wx/palmos/frame.h +++ b/include/wx/palmos/frame.h @@ -12,11 +12,7 @@ #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 +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -52,41 +48,25 @@ public: // ------------------------------- // event handlers - void OnSysColourChanged(wxSysColourChangedEvent& 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 - 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: @@ -98,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(); @@ -109,19 +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; + virtual bool IsMDIChild() const { return false; } // Data to save/restore when calling ShowFullScreen int m_fsStatusBarFields; // 0 for no status bar @@ -129,10 +94,6 @@ protected: int m_fsToolBarHeight; private: -#if wxUSE_TOOLTIPS - WXHWND m_hwndToolTip; -#endif // tooltips - // used by IconizeChildFrames(), see comments there bool m_wasMinimized;