fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 6e3e82e943071ea07b9267101f949f7a235b88e8..734e518ca79e80f1ce8534d246538c93bc94ab11 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -975,6 +975,10 @@ protected:
 
     virtual void DoSetClientData( void *data );
     virtual void *DoGetClientData() const;
 
     virtual void DoSetClientData( void *data );
     virtual void *DoGetClientData() const;

+    
+    // Makes an adjustment to the window position (for example, a frame that has
+    // a toolbar that it manages itself).
+    virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);

 
     // what kind of data do we have?
     wxClientDataType m_clientDataType;
 
     // what kind of data do we have?
     wxClientDataType m_clientDataType;


@@ -1019,8 +1023,6 @@ private:
         #define sm_classwxWindowMGL sm_classwxWindow
     #endif // wxUniv
     #include "wx/mgl/window.h"
         #define sm_classwxWindowMGL sm_classwxWindow
     #endif // wxUniv
     #include "wx/mgl/window.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/window.h"

 #elif defined(__WXMAC__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMac
 #elif defined(__WXMAC__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMac