no changes, just update the copyright in the header

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 9ae3e478484afb58e2da1265d7dee18b49f48d58..214833cd5df0997d63f4a9692b32df06a8d06b93 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -374,12 +374,8 @@ public:
         // get the size best suited for the window (in fact, minimal
         // acceptable size using which it will still look "nice" in
         // most situations)
         // get the size best suited for the window (in fact, minimal
         // acceptable size using which it will still look "nice" in
         // most situations)

-    wxSize GetBestSize() const
-    {
-        if (m_bestSizeCache.IsFullySpecified())
-            return m_bestSizeCache;
-        return DoGetBestSize();
-    }
+    wxSize GetBestSize() const;
+    

     void GetBestSize(int *w, int *h) const
     {
         wxSize s = GetBestSize();
     void GetBestSize(int *w, int *h) const
     {
         wxSize s = GetBestSize();


@@ -836,7 +832,9 @@ protected:
     //       The same holds for all other wxEvtHandler functions.
 
     using wxEvtHandler::ProcessEvent;
     //       The same holds for all other wxEvtHandler functions.
 
     using wxEvtHandler::ProcessEvent;

+#if wxUSE_THREADS

     using wxEvtHandler::ProcessThreadEvent;
     using wxEvtHandler::ProcessThreadEvent;

+#endif

     using wxEvtHandler::SafelyProcessEvent;
     using wxEvtHandler::ProcessPendingEvents;
     using wxEvtHandler::AddPendingEvent;
     using wxEvtHandler::SafelyProcessEvent;
     using wxEvtHandler::ProcessPendingEvents;
     using wxEvtHandler::AddPendingEvent;


@@ -1707,7 +1705,7 @@ private:
 
 
     DECLARE_ABSTRACT_CLASS(wxWindowBase)
 
 
     DECLARE_ABSTRACT_CLASS(wxWindowBase)

-    DECLARE_NO_COPY_CLASS(wxWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxWindowBase);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };