renamed wxMotif::wxTLW::DoCreate() to XmDoCreateTLW() to avoid conflicts with

DoCreate()s in derived classes and removed DoDestroy() entirely because there
was really no advantage in having it (it can't be called fom base class dtor)

also made XmDoCreateTLW() pure virtual which required changing
IMPLEMENT_DYNAMIC_CLASS into IMPLEMENT_ABSTRACT_CLASS for wxTopLevelWindow in
common code but this made sense anyhow because wxTLW should be an ABC anyhow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/motif/dialog.h

@@ -79,13 +79,14 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 private:
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,
                                const wxString& name);
-    virtual void DoDestroy();
+
 
     //// Motif-specific
     bool          m_modalShowing;

include/wx/motif/frame.h

@@ -117,13 +117,14 @@ private:
     virtual void DoSetClientSize(int width, int height);
 
 private:
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,
                                const wxString& name);
-    virtual void DoDestroy();
+
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)

include/wx/motif/toplevel.h

@@ -70,19 +70,17 @@ protected:
     void PreDestroy();
 
     virtual void DoGetPosition(int* x, int* y) const;
+
 private:
-    // both these functions should be pure virtual
+    // really create the Motif widget for TLW
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,
-                           const wxString& name )
+                               const wxString& name) = 0;
-    {
-        return false;
-    }
 
-    virtual void DoDestroy() { }
 
     wxString m_title;
 };

src/common/toplvcmn.cpp

@@ -46,7 +46,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
+IMPLEMENT_ABSTRACT_CLASS(wxTopLevelWindow, wxWindow)
 
 // ----------------------------------------------------------------------------
 // construction/destruction

src/motif/dialog.cpp

@@ -151,7 +151,8 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
-bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
+bool wxDialog::XmDoCreateTLW(wxWindow* parent,
+                             wxWindowID id,
                              const wxString& title,
                              const wxPoint& pos,
                              const wxSize& size,
@@ -233,11 +234,7 @@ wxDialog::~wxDialog()
     }
 
     PreDestroy();
-    DoDestroy();
-}
 
-void wxDialog::DoDestroy()
-{
     if ( m_mainWidget )
     {
         wxDeleteWindowFromTable( (Widget)m_mainWidget );

src/motif/frame.cpp

@@ -196,7 +196,8 @@ bool wxFrame::Create(wxWindow *parent,
     return true;
 }
 
-bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
+bool wxFrame::XmDoCreateTLW(wxWindow* parent,
+                            wxWindowID id,
                             const wxString& title,
                             const wxPoint& pos,
                             const wxSize& size,
@@ -292,11 +293,7 @@ wxFrame::~wxFrame()
     }
 
     PreDestroy();
-    DoDestroy();
-}
 
-void wxFrame::DoDestroy()
-{
     Widget frameShell = (Widget)GetShellWidget();
 
     if( frameShell )

src/motif/toplevel.cpp

@@ -121,7 +121,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 
     m_windowId = ( id > -1 ) ? id : NewControlId();
 
-    bool retval = DoCreate( parent, id, title, pos, size, style, name );
+    bool retval = XmDoCreateTLW( parent, id, title, pos, size, style, name );
 
     if( !retval ) return false;