wxMenuItem code cleanup, removing duplicate and unneccessary code

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index be53d0212375eb5af75275019a0d5074adb5f90e..a0a3247b9f39ffa04942ecb68852d6b0b1b8fedc 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -12,13 +12,11 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

 
 // Dialog boxes
 
 // Dialog boxes

-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
     wxDialog();
 
 public:
     wxDialog();
 


@@ -39,7 +37,7 @@ public:
         long style = wxDEFAULT_DIALOG_STYLE,
         const wxString& name = wxDialogNameStr);
 
         long style = wxDEFAULT_DIALOG_STYLE,
         const wxString& name = wxDialogNameStr);
 

-    ~wxDialog();
+    virtual ~wxDialog();

 
     virtual bool Destroy();
 
 
     virtual bool Destroy();
 


@@ -59,19 +57,8 @@ public:
     virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    inline WXWidget GetTopWidget() const { return m_mainWidget; }
-    inline WXWidget GetClientWidget() const { return m_mainWidget; }
-
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
+    WXWidget GetTopWidget() const { return m_mainWidget; }
+    WXWidget GetClientWidget() const { return m_mainWidget; }

 
 private:
     virtual bool XmDoCreateTLW(wxWindow* parent,
 
 private:
     virtual bool XmDoCreateTLW(wxWindow* parent,


@@ -89,15 +76,14 @@ private:
 
 protected:
     virtual void DoSetSize(int x, int y,
 
 protected:
     virtual void DoSetSize(int x, int y,

-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 
     virtual void DoSetClientSize(int width, int height);
 
 
 private:
 
     virtual void DoSetClientSize(int width, int height);
 
 
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 };
 

-#endif
-// _WX_DIALOG_H_
+#endif // _WX_DIALOG_H_