Add virtual keyword where applicable.

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 861062d819f4494c72db578bc3afc60be96c779b..be53d0212375eb5af75275019a0d5074adb5f90e 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/motif/dialog.h

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

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

 class WXDLLEXPORT wxEventLoop;
 
 // Dialog boxes
 class WXDLLEXPORT wxEventLoop;
 
 // Dialog boxes


@@ -26,7 +22,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
 public:
     wxDialog();
 
 public:
     wxDialog();
 

-    // Constructor with no modal flag - the new convention.

     wxDialog(wxWindow *parent, wxWindowID id,
         const wxString& title,
         const wxPoint& pos = wxDefaultPosition,
     wxDialog(wxWindow *parent, wxWindowID id,
         const wxString& title,
         const wxPoint& pos = wxDefaultPosition,


@@ -55,7 +50,7 @@ public:
     void SetModal(bool flag);
 
     virtual bool IsModal() const
     void SetModal(bool flag);
 
     virtual bool IsModal() const

-    { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    { return m_modalShowing; }

 
     virtual int ShowModal();
     virtual void EndModal(int retCode);
 
     virtual int ShowModal();
     virtual void EndModal(int retCode);


@@ -79,13 +74,14 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 private:
     void OnCloseWindow(wxCloseEvent& event);
 
 private:

-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
-                           const wxString& title,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style,
-                           const wxString& name );
-    virtual void DoDestroy();
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name);
+

 
     //// Motif-specific
     bool          m_modalShowing;
 
     //// Motif-specific
     bool          m_modalShowing;


@@ -98,6 +94,7 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
 
     virtual void DoSetClientSize(int width, int height);
 

+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };