typo fixed

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 457339052a0b512513cc1ee6a7047052124cedb9..f4b17984685d96504e64dd1337005fb5f4cb7456 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -146,6 +146,7 @@ public:
     // same as DoSetSize() for the client size
     virtual void DoSetClientSize(int width, int height);
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
     // same as DoSetSize() for the client size
     virtual void DoSetClientSize(int width, int height);
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );

+    virtual WXWidget GetHandle() const;

 
 // ---------------------------------------------------------------------------
 // wxWindowBase virtual implementations that need to be overriden
 
 // ---------------------------------------------------------------------------
 // wxWindowBase virtual implementations that need to be overriden


@@ -195,7 +196,7 @@ public:
     // title; for items, this is the label or button text.
     inline virtual wxString GetLabel() const { return GetTitle(); }
 
     // 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);
     // Caret manipulation
     virtual void CreateCaret(int w, int h);
     virtual void CreateCaret(const wxBitmap *bitmap);


@@ -203,7 +204,7 @@ public:
     virtual void ShowCaret(bool show);
     virtual void SetCaretPos(int x, int y);
     virtual void GetCaretPos(int *x, int *y) const;
     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);
 
     // Handle a control command
     virtual void OnCommand(wxWindow& win, wxCommandEvent& event);


@@ -216,6 +217,7 @@ public:
     // on a listbox)
     virtual void OnDefaultAction(wxControl *initiatingItem);
 
     // on a listbox)
     virtual void OnDefaultAction(wxControl *initiatingItem);
 

+    // EventHandlers

     void OnEraseBackground(wxEraseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnKeyDown(wxKeyEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnKeyDown(wxKeyEvent& event);


@@ -267,10 +269,26 @@ protected:
 
 public:
     int                   m_returnCode;
 
 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:
 
 DECLARE_EVENT_TABLE()
 private:

-    void Init();
+    void   Init();
+    void   PMDetachWindowMenu();
+    WXHWND GetHwnd() const { return m_hWnd; }
+    void   SetHwnd(WXHWND hWnd) { m_hWnd = hWnd; }

 };
 
 ////////////////////////////////////////////////////////////////////////
 };
 
 ////////////////////////////////////////////////////////////////////////