Applied patch to add n bitmaps at once to an image

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 5a5a49a3212e721e42b2af5d501dcd146146b630..d4ae70e32cde00b6674be5a0e24fd672e52d6c9a 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/os2/dialog.h
 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
 class WXDLLEXPORT wxDialogModalData;
 
@@ -90,8 +90,7 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
-    // obsolete methods
-    // ----------------
+#if WXWIN_COMPATIBILITY_2_6
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDEPRECATED( wxDialog( wxWindow*       pParent
@@ -111,6 +110,8 @@ public:
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 
+#endif // WXWIN_COMPATIBILITY_2_6
+
 protected:
     //
     // find the window to use as parent for this dialog if none has been
@@ -147,4 +148,3 @@ private:
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_
-