X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94c7b08817de7e79ee07088a0b9ab3c6b07ef583..259c43f679ca655362b5a439e11c87fc0666d663:/include/wx/motif/toplevel.h diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h index eaca8020f6..ae5e79cce9 100644 --- a/include/wx/motif/toplevel.h +++ b/include/wx/motif/toplevel.h @@ -12,10 +12,6 @@ #ifndef __MOTIFTOPLEVELH__ #define __MOTIFTOPLEVELH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toplevel.h" -#endif - class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase { public: @@ -70,17 +66,22 @@ protected: void PreDestroy(); virtual void DoGetPosition(int* x, int* y) const; + private: - // both these functions should be pure virtual - virtual bool DoCreate( wxWindow* parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ) - { - return false; - } +#if wxCHECK_VERSION(2,7,0) + // DoDestroy() is not used anywhere else, DoCreate() should also be renamed + // in src/motif/dialog.cpp, frame.cpp and toplevel.cp + #error "Remove DoDestroy() and rename DoCreate() to XmDoCreateTLW(), they were only kept for binary backwards compatibility" +#endif + + // really create the Motif widget for TLW + virtual bool DoCreate(wxWindow* parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) = 0; virtual void DoDestroy() { }