keep the old wxFont::Create() signature (changed by font size in pixels patch) to...

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 3a0b1e7d523e79255b4c597a50f9c3daad245989..e43fff75ef51131d698413a2513c0d30830224a6 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -102,6 +102,10 @@ enum wxWindowVariant
     wxWINDOW_VARIANT_MAX
 };
 
+#if wxUSE_SYSTEM_OPTIONS
+    #define wxWINDOW_DEFAULT_VARIANT wxT("window-default-variant")
+#endif
+
 // ----------------------------------------------------------------------------
 // (pseudo)template list classes
 // ----------------------------------------------------------------------------
@@ -1014,6 +1018,10 @@ public:
         // is only used for wxWin itself or for user code which wants to call
         // platform-specific APIs
     virtual WXWidget GetHandle() const = 0;
+        // associate the window with a new native handle
+    virtual void AssociateHandle(WXWidget WXUNUSED(handle)) { }
+        // dissociate the current native handle from the window
+    virtual void DissociateHandle() { }
 
 #if wxUSE_PALETTE
         // Store the palette used by DCs in wxWindow so that the dcs can share
@@ -1194,7 +1202,7 @@ protected:
     void SetBestSize(const wxSize& size) { SetBestFittingSize(size); }
 
     // set the initial window size if none is given (i.e. at least one of the
-    // components of the size passed to ctor/Create() is -1)
+    // components of the size passed to ctor/Create() is wxDefaultCoord)
     //
     // normally just calls SetBestSize() for controls, but can be overridden
     // not to do it for the controls which have to do some additional