X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40ad34262a834611ec166231bc8a12f5f1ba42be..401e3b6e5f50f15571b86297b5d1e3f55c473f6f:/include/wx/msw/window.h

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 9c19488f92..68f84fae4a 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -32,7 +32,7 @@
 // constants
 // ---------------------------------------------------------------------------
 
-// FIXME does anybody use those? they're unused by wxWindows...
+// FIXME does anybody use those? they're unused by wxWidgets...
 enum
 {
     wxKEY_SHIFT = 1,
@@ -163,6 +163,9 @@ public:
 
     void OnEraseBackground(wxEraseEvent& event);
     void OnPaint(wxPaintEvent& event);
+#ifdef __WXWINCE__
+    void OnInitDialog( wxInitDialogEvent& event );
+#endif
 
 public:
     // For implementation purposes - sometimes decorations make the client area
@@ -176,7 +179,7 @@ public:
     WXFARPROC MSWGetOldWndProc() const { return m_oldWndProc; }
     void MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; }
 
-    // return TRUE if the window is of a standard (i.e. not wxWindows') class
+    // return TRUE if the window is of a standard (i.e. not wxWidgets') class
     //
     // to understand why does it work, look at SubclassWin() code and comments
     bool IsOfStandardClass() const { return m_oldWndProc != NULL; }
@@ -187,21 +190,21 @@ public:
     // MSW only: TRUE if this control is part of the main control
     virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
 
-    // translate wxWindows style flags for this control into the Windows style
+    // translate wxWidgets style flags for this control into the Windows style
     // and optional extended style for the corresponding native control
     //
     // this is the function that should be overridden in the derived classes,
     // but you will mostly use MSWGetCreateWindowFlags() below
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const ;
 
-    // get the MSW window flags corresponding to wxWindows ones
+    // get the MSW window flags corresponding to wxWidgets ones
     //
     // the functions returns the flags (WS_XXX) directly and puts the ext
     // (WS_EX_XXX) flags into the provided pointer if not NULL
     WXDWORD MSWGetCreateWindowFlags(WXDWORD *exflags = NULL) const
         { return MSWGetStyle(GetWindowStyle(), exflags); }
 
-    // translate wxWindows coords into Windows ones suitable to be passed to
+    // translate wxWidgets coords into Windows ones suitable to be passed to
     // ::CreateWindow()
     //
     // returns TRUE if non default coords are returned, FALSE otherwise
@@ -419,6 +422,9 @@ protected:
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
 
+    // has the window been frozen by Freeze()?
+    bool IsFrozen() const { return m_frozenness > 0; }
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange
@@ -502,7 +508,11 @@ public:
 #include "wx/hash.h"
 
 // pseudo-template HWND <-> wxWindow hash table
+#if WXWIN_COMPATIBILITY_2_4
+WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable);
+#else
 WX_DECLARE_HASH(wxWindowMSW, wxWindowList, wxWinHashTable);
+#endif
 
 extern wxWinHashTable *wxWinHandleHash;