New, reworked frame class for wxOS2

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 67a9dc775bceac3356ed5b1917f3c96a3cf8ecdb..7df92f7e21e7604acd61efa21339b6b33ffe329c 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -144,6 +144,9 @@ public:
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();
 
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();
 

+ friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
+ friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
+

 protected:
     // common part of all ctors
     void         Init(void);
 protected:
     // common part of all ctors
     void         Init(void);


@@ -209,8 +212,11 @@ private:
 #endif // tooltips
 
     //
 #endif // tooltips
 
     //

-    // Handles to child windows of the Frame that we don't have child objects for
+    // Handles to child windows of the Frame, and the frame itself,
+    // that we don't have child objects for (m_hWnd in wxWindow is the
+    // handle of the Frame's client window!

     //
     //

+    WXHWND                          m_hFrame;

     WXHWND                          m_hTitleBar;
     WXHWND                          m_hHScroll;
     WXHWND                          m_hVScroll;
     WXHWND                          m_hTitleBar;
     WXHWND                          m_hHScroll;
     WXHWND                          m_hVScroll;