wxStyledTextCtrl can now be built and used when wxUSE_UNICODE==1.

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index a2cc6c0ef8882e4ef509e088eedd7af9182cf673..ae36a9fa4224e9e3d94832ede7ffb5cd8db18222 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -113,6 +113,7 @@ public:
     // override some base class virtuals
     virtual bool Destroy();
     virtual bool IsTopLevel() const { return TRUE; }
+    virtual wxSize GetMaxSize() const;
 
     // event handlers
     void OnCloseWindow(wxCloseEvent& event);
@@ -122,14 +123,6 @@ public:
     // so should be there for all platforms
     void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
 
-    // Override in derived, platfrom specific, class if your OS coordinate
-    // system uses anything other than the top left as 0,0.  The second
-    // method updates any internal sizing parameters such as OS/2's SWP struct
-    inline virtual void AlterChildPos(void) { }
-    inline virtual void UpdateInternalSize( wxWindow* WXUNUSED(pChild)
-                                           ,int WXUNUSED(nHeight)
-                                          ) { }
-
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area
@@ -157,6 +150,9 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowGTK
+#elif defined(__WXX11__)
+    #include "wx/x11/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowX11
 #elif defined(__WXMGL__)
     #include "wx/mgl/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMGL
@@ -196,3 +192,5 @@ protected:
 
 
 #endif // _WX_TOPLEVEL_BASE_H_
+
+// vi:sts=4:sw=4:et