wxMac merge

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index c61b9100ab6d16ba766beafe1f75de862e760871..94fe07be61f129c9e76b471b1c9aced3500bb8b0 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -12,6 +12,11 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
+//
+// Get the default resource ID's for frames
+//
+#include "wx/os2/wxOs2.h"
+
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
@@ -97,6 +102,7 @@ public:
 #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)
@@ -197,6 +203,33 @@ private:
     WXHWND                          m_hWndToolTip;
 #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
+    //
+    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;
+
+    //
+    // Swp structures for various client data
+    // DW: Better off in attached RefData?
+    //
+    SWP                             m_vSwp;
+    SWP                             m_vSwpClient;
+    SWP                             m_vSwpTitleBar;
+    SWP                             m_vSwpMenuBar;
+    SWP                             m_vSwpHScroll;
+    SWP                             m_vSwpVScroll;
+    SWP                             m_vSwpStatusBar;
+    SWP                             m_vSwpToolBar;
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };