X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dd9b9e2be1809f484b6447ad9525fa5b404ad95..d6f04127fe1b3a9008605b22419af78eba5ae857:/include/wx/msw/window.h?ds=sidebyside

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index dd35d7fd88..733fcf4dc6 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -21,7 +21,7 @@
 // wxWindow declaration for MSW
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowMSW : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowMSW : public wxWindowBase
 {
     friend class wxSpinCtrl;
     friend class wxSlider;
@@ -83,9 +83,6 @@ public:
     virtual void Refresh( bool eraseBackground = true,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();
-    virtual void Freeze();
-    virtual void Thaw();
-    virtual bool IsFrozen() const { return m_frozenness > 0; }
 
     virtual void SetWindowStyleFlag(long style);
     virtual void SetExtraStyle(long exStyle);
@@ -503,6 +500,9 @@ protected:
 
     virtual void DoEnable(bool enable);
 
+    virtual void DoFreeze();
+    virtual void DoThaw();
+
     // this simply moves/resizes the given HWND which is supposed to be our
     // sibling (this is useful for controls which are composite at MSW level
     // and for which DoMoveWindow() is not enough)
@@ -555,8 +555,6 @@ private:
     bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
 
-    
-
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 
@@ -567,10 +565,6 @@ protected:
     wxPoint     m_pendingPosition;
     wxSize      m_pendingSize;
 
-    // number of calls to Freeze() minus number of calls to Thaw()
-    // protected so that wxTopLevelWindowMSW can access it
-    unsigned int m_frozenness;
-
 private:
 #ifdef __POCKETPC__
     bool        m_contextMenuEnabled;
@@ -590,8 +584,8 @@ private:
 // ---------------------------------------------------------------------------
 
 // kbd code translation
-WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0);
-WXDLLEXPORT WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL);
+WXDLLIMPEXP_CORE int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0);
+WXDLLIMPEXP_CORE WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL);
 
 // window creation helper class: before creating a new HWND, instantiate an
 // object of this class on stack - this allows to process the messages sent to
@@ -603,17 +597,4 @@ public:
     ~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
-WX_DECLARE_HASH(wxWindowMSW, wxWindowList, wxWinHashTable);
-
-extern wxWinHashTable *wxWinHandleHash;
-
 #endif // _WX_WINDOW_H_