projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix for compilers not using PCH
[wxWidgets.git]
/
include
/
wx
/
generic
/
msgdlgg.h
diff --git
a/include/wx/generic/msgdlgg.h
b/include/wx/generic/msgdlgg.h
index c9f37780377d4cdd62d5b9c7f17933372c60a1af..01022ecdc459ed897d8a2241b8b06303edfe77d7 100644
(file)
--- a/
include/wx/generic/msgdlgg.h
+++ b/
include/wx/generic/msgdlgg.h
@@
-6,13
+6,13
@@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c)
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c)
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __MSGDLGH_G__
#define __MSGDLGH_G__
/////////////////////////////////////////////////////////////////////////////
#ifndef __MSGDLGH_G__
#define __MSGDLGH_G__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "msgdlgg.h"
#endif
#pragma interface "msgdlgg.h"
#endif
@@
-22,31
+22,29
@@
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL
-WXDLLEXPORT_DATA(extern const
c
har*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const
wxC
har*) wxMessageBoxCaptionStr;
class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
-protected:
- long m_dialogStyle;
+
public:
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);
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
#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
-#endif
- // __MSGDLGH_G__
+#endif // __MSGDLGH_G__