wxPalmOS frame code clearning from MSW specific parts. Initial GetClientAreaOrigin...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/palmos/frame.h b/include/wx/palmos/frame.h
index 920f3c5c6d18b2a891a2e944b330c802c439150f..76f5bd804f21a44924a60752c7627f7cc3c2cf46 100644 (file)
--- a/include/wx/palmos/frame.h
+++ b/include/wx/palmos/frame.h
@@ -58,30 +58,17 @@ public:
     // 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
@@ -98,9 +85,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,30 +93,14 @@ 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;
-
     // Data to save/restore when calling ShowFullScreen
     int                   m_fsStatusBarFields; // 0 for no status bar
     int                   m_fsStatusBarHeight;
     int                   m_fsToolBarHeight;
 
 private:
-#if wxUSE_TOOLTIPS
-    WXHWND                m_hwndToolTip;
-#endif // tooltips
-
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;
 

diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp
index 44da88f26872c5ee3fd8e4ef8945d4110364a6be..2267eee58ef5d26c1b62dc0d904306a0b67ac39d 100644 (file)
--- a/src/palmos/frame.cpp
+++ b/src/palmos/frame.cpp
@@ -193,24 +193,8 @@ void wxFrame::Raise()
 {
 }
 
-// generate an artificial resize event
-void wxFrame::SendSizeEvent()
-{
-}
-
 #if wxUSE_MENUS_NATIVE
 
-void wxFrame::AttachMenuBar(wxMenuBar *menubar)
-{
-    wxFrameBase::AttachMenuBar(menubar);
-
-    if ( !menubar )
-    {
-        // actually remove the menu from the frame
-        m_hMenu = (WXHMENU)0;
-    }
-}
-
 void wxFrame::InternalSetMenuBar()
 {
 }
@@ -291,25 +275,10 @@ void wxFrame::IconizeChildFrames(bool bIconize)
 {
 }
 
-WXHICON wxFrame::GetDefaultIcon() const
-{
-    // we don't have any standard icons (any more)
-    return (WXHICON)0;
-}
-
 // ===========================================================================
 // message processing
 // ===========================================================================
 
-// ---------------------------------------------------------------------------
-// preprocessing
-// ---------------------------------------------------------------------------
-
-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
-{
-    return false;
-}
-
 // ---------------------------------------------------------------------------
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
@@ -324,20 +293,6 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
     return false;
 }
 
-bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
-{
-    return false;
-}
-
-// ---------------------------------------------------------------------------
-// the window proc for wxFrame
-// ---------------------------------------------------------------------------
-
-WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-    return false;
-}
-
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the
@@ -347,6 +302,8 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
 // get the origin of the client area in the client coordinates
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
-    wxPoint pt;
+    Coord x, y;
+    WinWindowToDisplayPt(&x,&y);
+    wxPoint pt(x,y);
     return pt;
 }