X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54da4255a20216b070ec044ae2b8af75e9f2681f..6bddd8c5f3cf709fc95747a4fe211690456e157d:/include/wx/os2/window.h

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 860eb58ef2..12d2e8d66b 100644
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -167,6 +167,14 @@ public:
     // Dialog support: override these and call
     // base class members to add functionality
     // that can't be done using validators.
+    void SetClientSize( int width, int height )
+        { DoSetClientSize(width, height); }
+
+    void SetClientSize( const wxSize& size )
+        { DoSetClientSize(size.x, size.y); }
+
+    void SetClientSize(const wxRect& rect)
+        { SetClientSize( rect.width, rect.height ); }
 
     // Validate controls. If returns FALSE,
     // validation failed: don't quit
@@ -187,7 +195,7 @@ public:
     // title; for items, this is the label or button text.
     inline virtual wxString GetLabel() const { return GetTitle(); }
 
-
+#if wxUSE_CARET && WXWIN_COMPATIBILITY
     // Caret manipulation
     virtual void CreateCaret(int w, int h);
     virtual void CreateCaret(const wxBitmap *bitmap);
@@ -195,7 +203,7 @@ public:
     virtual void ShowCaret(bool show);
     virtual void SetCaretPos(int x, int y);
     virtual void GetCaretPos(int *x, int *y) const;
-
+#endif
 
     // Handle a control command
     virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
@@ -208,6 +216,7 @@ public:
     // on a listbox)
     virtual void OnDefaultAction(wxControl *initiatingItem);
 
+    // EventHandlers
     void OnEraseBackground(wxEraseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnKeyDown(wxKeyEvent& event);
@@ -259,10 +268,26 @@ protected:
 
 public:
     int                   m_returnCode;
+    bool                  m_isBeingDeleted;
+    bool                  m_isShown;
+    bool                  m_winCaptured;
+    bool                  m_mouseInWindow;
+    bool                  m_backgroundTransparent;
+    // handles
+    WXHWND                m_hWnd;
+    WXHMENU               m_hMenu; // Menu, if any
+
+    // the size of one page for scrolling
+    int                   m_xThumbSize;
+    int                   m_yThumbSize;
+    long                  m_lDlgCode;
 
 DECLARE_EVENT_TABLE()
 private:
-    void Init();
+    void   Init();
+    void   PMDetachWindowMenu();
+    WXHWND GetHwnd() const { return m_hWnd; }
+    void   SetHwnd(WXHWND hWnd) { m_hWnd = hWnd; }
 };
 
 ////////////////////////////////////////////////////////////////////////