Fixed compilation error on OS/2 (strnlen declaration was not visible).

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index ed8b2e9f5ff8ae22e1b7692f62eb63109f7798a3..2421a6eb23fe10aea28ce63d2541a943d5828ac8 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -21,6 +21,7 @@
 #include "wx/nonownedwnd.h"
 #include "wx/iconbndl.h"
 #include "wx/containr.h"
+#include "wx/weakref.h"
 
 // the default names for various classes
 extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[];
@@ -288,19 +289,15 @@ protected:
     static int WidthDefault(int w) { return w == wxDefaultCoord ? GetDefaultSize().x : w; }
     static int HeightDefault(int h) { return h == wxDefaultCoord ? GetDefaultSize().y : h; }
 
-    // reset m_winDefault and m_winTmpDefault if they point to the window being
-    // destroyed
-    void OnChildDestroy(wxWindowDestroyEvent& event);
-
 
     // the frame icon
     wxIconBundle m_icons;
 
     // a default window (usually a button) or NULL
-    wxWindow *m_winDefault;
+    wxWindowRef m_winDefault;
 
     // a temporary override of m_winDefault, use the latter if NULL
-    wxWindow *m_winTmpDefault;
+    wxWindowRef m_winTmpDefault;
 
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
     DECLARE_EVENT_TABLE()
@@ -331,7 +328,7 @@ protected:
     #include "wx/dfb/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowDFB
 #elif defined(__WXMAC__)
-    #include "wx/mac/toplevel.h"
+    #include "wx/osx/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/toplevel.h"