X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..e5d92e2bef8fed2f3fabaf9662902eb7189f5f92:/include/wx/toplevel.h?ds=sidebyside diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index e2201ae8fd..86805fe5ed 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -14,10 +14,6 @@ #ifndef _WX_TOPLEVEL_BASE_H_ #define _WX_TOPLEVEL_BASE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toplevelbase.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -26,7 +22,7 @@ #include "wx/iconbndl.h" // the default names for various classs -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; class WXDLLEXPORT wxTopLevelWindowBase; @@ -71,7 +67,7 @@ class WXDLLEXPORT wxTopLevelWindowBase; #elif defined(__WINCE_STANDARDSDK__) #define wxDEFAULT_FRAME_STYLE (wxMAXIMIZE|wxCLOSE_BOX) #else - #define wxDEFAULT_FRAME_STYLE (0) + #define wxDEFAULT_FRAME_STYLE (wxNO_BORDER) #endif #else // !__WXWINCE__ #define wxDEFAULT_FRAME_STYLE \ @@ -196,6 +192,9 @@ public: void OnCloseWindow(wxCloseEvent& event); void OnSize(wxSizeEvent& WXUNUSED(event)) { DoLayout(); } + // Get rect to be used to center top-level children + virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h); + // this should go away, but for now it's called from docview.cpp, // so should be there for all platforms void OnActivate(wxActivateEvent &WXUNUSED(event)) { } @@ -203,6 +202,17 @@ public: // do the window-specific processing after processing the update event virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ; + // Reserved for future use + virtual void ReservedTopLevelWindowFunc1() {} + virtual void ReservedTopLevelWindowFunc2() {} + virtual void ReservedTopLevelWindowFunc3() {} + virtual void ReservedTopLevelWindowFunc4() {} + virtual void ReservedTopLevelWindowFunc5() {} + virtual void ReservedTopLevelWindowFunc6() {} + virtual void ReservedTopLevelWindowFunc7() {} + virtual void ReservedTopLevelWindowFunc8() {} + virtual void ReservedTopLevelWindowFunc9() {} + protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area @@ -241,7 +251,7 @@ protected: // include the real class declaration -#if defined(__PALMOS__) +#if defined(__WXPALMOS__) #include "wx/palmos/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowPalm #elif defined(__WXMSW__)