wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 74f5ec8e5b3485bbc18f424237935816305d8654..d40b27c79d809528f565439a7c7519aac0f84aa7 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -28,13 +28,6 @@
 // a better solution should be found later...
 #define wxUSE_MOUSEEVENT_HACK 0
 
 // a better solution should be found later...
 #define wxUSE_MOUSEEVENT_HACK 0
 

-#include "wx/hash.h"
-
-// pseudo-template HWND <-> wxWindow hash table
-WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable);
-
-extern wxWinHashTable *wxWinHandleHash;
-

 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------


@@ -53,14 +46,18 @@ enum
 class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {
 public:
 class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {
 public:

-    wxWindowMSW();
+    wxWindowMSW() { Init(); }

 
     wxWindowMSW(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
 
     wxWindowMSW(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxPanelNameStr)
+    {
+        Init();
+        Create(parent, id, pos, size, style, name);
+    }

 
     virtual ~wxWindowMSW();
 
 
     virtual ~wxWindowMSW();
 


@@ -300,7 +297,6 @@ public:
     bool HandleActivate(int flag, bool minimized, WXHWND activate);
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleActivate(int flag, bool minimized, WXHWND activate);
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);

-    bool HandleSysCommand(WXWPARAM wParam, WXLPARAM lParam);

 
     bool HandleCtlColor(WXHBRUSH *hBrush,
                         WXHDC hdc,
 
     bool HandleCtlColor(WXHBRUSH *hBrush,
                         WXHDC hdc,


@@ -343,10 +339,10 @@ public:
     bool HandleSetCursor(WXHWND hWnd, short nHitTest, int mouseMsg);
 
     // Window procedure
     bool HandleSetCursor(WXHWND hWnd, short nHitTest, int mouseMsg);
 
     // Window procedure

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
     // Calls an appropriate default window procedure
 
     // Calls an appropriate default window procedure

-    virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
     // message processing helpers
 
 
     // message processing helpers
 


@@ -459,6 +455,9 @@ private:
     // list of disabled children before last call to our Disable()
     wxWindowList *m_childrenDisabled;
 
     // list of disabled children before last call to our Disable()
     wxWindowList *m_childrenDisabled;
 

+    // number of calls to Freeze() minus number of calls to Thaw()
+    unsigned int m_frozenness;
+

     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)
     DECLARE_EVENT_TABLE()


@@ -481,7 +480,7 @@ inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { }
 // ---------------------------------------------------------------------------
 
 // kbd code translation
 // ---------------------------------------------------------------------------
 
 // kbd code translation

-WXDLLEXPORT int wxCharCodeMSWToWX(int keySym);
+WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0);

 WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual);
 
 // window creation helper class: before creating a new HWND, instantiate an
 WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual);
 
 // window creation helper class: before creating a new HWND, instantiate an


@@ -494,5 +493,22 @@ public:
     ~wxWindowCreationHook();
 };
 
     ~wxWindowCreationHook();
 };
 

+// ----------------------------------------------------------------------------
+// global objects
+// ----------------------------------------------------------------------------
+
+// notice that this hash must be defined after wxWindow declaration as it
+// needs to "see" its dtor and not just forward declaration
+#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;
+

 #endif
     // _WX_WINDOW_H_
 #endif
     // _WX_WINDOW_H_