X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc2b747254c8ec8eebba7fb63cd5da5d7166c0db..7af6f32725483589cd56b409368fe986f9b4e0d1:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 86a5d191fc..efa973ec85 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -157,30 +157,40 @@ public:
         // event handlers
     bool MSWOnPaint();
     WXHICON MSWOnQueryDragIcon();
-    void MSWOnSize(int x, int y, WXUINT flag);
+    bool MSWOnSize(int x, int y, WXUINT flag);
     bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
-    bool MSWOnClose();
-    void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
+    bool MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
     bool MSWProcessMessage(WXMSG *msg);
     bool MSWTranslateMessage(WXMSG *msg);
-    void MSWCreate(int id, wxWindow *parent, const char *wclass,
+    bool MSWCreate(int id, wxWindow *parent, const char *wclass,
                    wxWindow *wx_win, const char *title,
                    int x, int y, int width, int height, long style);
 
+    bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
+
   // tooltip management
 #if wxUSE_TOOLTIPS
-  WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-  void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
+    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
+    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
 protected:
-    void DoGetClientSize(int *width, int *height) const;
-    void DoGetSize(int *width, int *height) const ;
-    void DoGetPosition(int *x, int *y) const ;
+    // override base class virtuals
+    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoGetSize(int *width, int *height) const ;
+    virtual void DoGetPosition(int *x, int *y) const ;
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
 
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
 
+    // window proc for the frames
+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
     wxMenuBar *           m_frameMenuBar;
     wxStatusBar *         m_frameStatusBar;
     wxIcon                m_icon;
@@ -190,16 +200,11 @@ protected:
 
     static bool           m_useNativeStatusBar;
 
+private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-
-private:
     DECLARE_EVENT_TABLE()
 };