projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSi...
[wxWidgets.git]
/
include
/
wx
/
generic
/
msgdlgg.h
diff --git
a/include/wx/generic/msgdlgg.h
b/include/wx/generic/msgdlgg.h
index 521f5586fa8340c0c6152afdd8159de105ee07d2..d9fa1cc712dac779e0d2a1469df5bee8bc0fa1d7 100644
(file)
--- a/
include/wx/generic/msgdlgg.h
+++ b/
include/wx/generic/msgdlgg.h
@@
-1,30
+1,26
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: msgdlgg.h
+// Name:
wx/generic/
msgdlgg.h
// Purpose: Generic wxMessageDialog
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Purpose: Generic wxMessageDialog
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
-// Licence: wxWindows licence
+// Copyright: (c)
Julian Smart
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __MSGDLGH_G__
#define __MSGDLGH_G__
/////////////////////////////////////////////////////////////////////////////
#ifndef __MSGDLGH_G__
#define __MSGDLGH_G__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlgg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL
#include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL
-
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr
;
+
extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[]
;
-class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
+class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
, public wxMessageDialogBase
{
DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
{
DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
@@
-38,8
+34,6
@@
public:
void OnCancel(wxCommandEvent& event);
private:
void OnCancel(wxCommandEvent& event);
private:
- long m_dialogStyle;
-
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
@@
-47,5
+41,4
@@
private:
#define wxMessageDialog wxGenericMessageDialog
#endif
#define wxMessageDialog wxGenericMessageDialog
#endif
-#endif
- // __MSGDLGH_G__
+#endif // __MSGDLGH_G__