Replaced typedef with #define for VC++ 1.5, to prevent 'no constructor' error

[wxWidgets.git] / include / wx / os2 / frame.h

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 94fe07be61f129c9e76b471b1c9aced3500bb8b0..dc64bf4ae7d41a4e01eb1443e34961f6d3dd43cc 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -102,7 +102,6 @@ public:
 #endif // wxUSE_STATUSBAR
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 #endif // wxUSE_STATUSBAR
 
     WXHMENU GetWinMenu() const { return m_hMenu; }

-    WXHWND  GetFrame() const { return m_hFrame; }

 
     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)
 
     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)


@@ -141,6 +140,14 @@ public:
     void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
 #endif // tooltips
 
     void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
 #endif // tooltips
 

+    void      SetClient(WXHWND    c_Hwnd);
+    void      SetClient(wxWindow* c_Window);
+    wxWindow *GetClient();
+    HWND      GetFrame(void) const { return m_hFrame; }
+
+ 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);


@@ -197,6 +204,8 @@ protected:
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;

+    bool                            m_bIsShown;
+    wxWindow*                       m_pWinLastFocused;

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS


@@ -204,15 +213,11 @@ private:
 #endif // tooltips
 
     //
 #endif // tooltips
 
     //

-    // The main handle of a frame window, that used for message processing
-    // is the client handle under PM.  But we still need the frame handle
-    // as well
+    // 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_hFrame;

-
-    //
-    // Handles to child windows of the Frame that we don't have child objects for
-    //

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