allow setting empty tooltip in SetIcon() (patch 1750994)

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

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 700e52a40f7b84fd06bbd9a5512efa31e270acca..80e3f1d204fb4838004a7befc98e457230572cc9 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -12,10 +12,6 @@
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-

 class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase
 {
 public:
 class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase
 {
 public:


@@ -72,14 +68,8 @@ protected:
     virtual void DoGetPosition(int* x, int* y) const;
 
 private:
     virtual void DoGetPosition(int* x, int* y) const;
 
 private:

-#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
     // really create the Motif widget for TLW

-    virtual bool DoCreate(wxWindow* parent,
+    virtual bool XmDoCreateTLW(wxWindow* parent,

                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,


@@ -87,7 +77,6 @@ private:
                                long style,
                                const wxString& name) = 0;
 
                                long style,
                                const wxString& name) = 0;
 

-    virtual void DoDestroy() { }

 
     wxString m_title;
 };
 
     wxString m_title;
 };