applied fix to fix BCC's wxBitmap ctor problem

[wxWidgets.git] / include / wx / os2 / msgdlg.h

diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index 0855e17f812388ad86776180c7dbc04dafd6b434..af7a32d0466231870cae8c3613453943acd60d5a 100644 (file)
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -22,25 +22,34 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
 

-class WXDLLEXPORT wxMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog : public wxDialog

 {
 DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 {
 DECLARE_DYNAMIC_CLASS(wxMessageDialog)

-protected:
-    wxString    m_caption;
-    wxString    m_message;
-    long        m_dialogStyle;
-    wxWindow *  m_parent;

 public:
 public:

-    wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-        long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
-
-    int ShowModal();
-};
+    wxMessageDialog( wxWindow*       pParent
+                    ,const wxString& rsMessage
+                    ,const wxString& rsCaption = wxMessageBoxCaptionStr
+                    ,long            lStyle = wxOK|wxCENTRE
+                    ,const wxPoint&  rPos = wxDefaultPosition
+                   );

 
 

+    int ShowModal(void);

 
 

-int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
-  long style = wxOK|wxCENTRE,
-  wxWindow *parent = NULL, int x = -1, int y = -1);
+protected:
+    wxString                        m_sCaption;
+    wxString                        m_sMessage;
+    long                            m_lDialogStyle;
+    wxWindow*                       m_pParent;
+}; // end of CLASS wxMessageDialog
+
+
+int WXDLLEXPORT wxMessageBox( const wxString& rsMessage
+                             ,const wxString& rsCaption = wxMessageBoxCaptionStr
+                             ,long            lStyle = wxOK|wxCENTRE
+                             ,wxWindow*       pParent = NULL
+                             ,int             nX = -1
+                             ,int             nY = -1
+                            );

 
 #endif
     // _WX_MSGBOXDLG_H_
 
 #endif
     // _WX_MSGBOXDLG_H_