X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cc4e7b6ccea5e345e54871f25951e3a0fe2570a..0944fceb987def04dc89d03d58c35793d0ecdfed:/include/wx/toplevel.h diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index a3821d3199..ed79f0f1e4 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -26,7 +26,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 +71,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 \ @@ -191,7 +191,6 @@ public: virtual bool Destroy(); virtual bool IsTopLevel() const { return true; } virtual wxSize GetMaxSize() const; - virtual bool ProvidesBackground() const { return true; } // event handlers void OnCloseWindow(wxCloseEvent& event); @@ -207,6 +206,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 @@ -245,7 +255,7 @@ protected: // include the real class declaration -#if defined(__PALMOS__) +#if defined(__WXPALMOS__) #include "wx/palmos/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowPalm #elif defined(__WXMSW__)