1. wxStaticBitmap now uses mask even for bitmaps (and not only icons)

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

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 7188bb2f62a4b8c35014ebb3ec6ab1627b202bdf..43093a234f9de8ecbe024aaac6be42447f92f385 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MSGBOXDLGH__
-#define __MSGBOXDLGH__
+#ifndef _WX_MSGBOXDLG_H_
+#define _WX_MSGBOXDLG_H_

 
 #ifdef __GNUG__
 #pragma interface "msgdlg.h"
 
 #ifdef __GNUG__
 #pragma interface "msgdlg.h"


@@ -23,7 +23,7 @@
  * Message box dialog
  */
 
  * Message box dialog
  */
 

-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;

 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {


@@ -42,8 +42,8 @@ public:
 
 
 int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
 
 
 int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,

-  const long style = wxOK|wxCENTRE,
-  wxWindow *parent = NULL, const int x = -1, const int y = -1);
+  long style = wxOK|wxCENTRE,
+  wxWindow *parent = NULL, int x = -1, int y = -1);

 
 #endif
 
 #endif

-    // __MSGBOXDLGH__
+    // _WX_MSGBOXDLG_H_