removed code (not necessary anymore)

[wxWidgets.git] / include / wx / generic / msgdlgg.h

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 6f7401a21778f991d8368d93ddff30811b38800e..471c7d052143358ca39d76cae38905c28c859fc7 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -27,25 +27,24 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
-protected:
-    long m_dialogStyle;
+
 public:
-    wxGenericMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
+    wxGenericMessageDialog(wxWindow *parent, const wxString& message,
+        const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+private:
+    long m_dialogStyle;
+
+    DECLARE_EVENT_TABLE()
 };
 
-#if !defined( __WXMSW__ ) && !defined( __WXMAC__)
+#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)) || defined(__WXUNIVERSAL__)
 #define wxMessageDialog wxGenericMessageDialog
-
-int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
-
 #endif
 
 #endif