use global operator new to fix compilation errors if type T overloads new (as wxObjec...

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 62bfb792650b52d46cba89bdd21c101d181d47fd..a8160033fdb05974209692ee10ef73f5d5d15edb 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -53,9 +53,9 @@ enum wxDialogLayoutAdaptationMode
     wxDIALOG_ADAPTATION_MODE_DISABLED = 2   // disable this dialog overriding global status
 };
 
     wxDIALOG_ADAPTATION_MODE_DISABLED = 2   // disable this dialog overriding global status
 };
 

-extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];

 
 

-class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow

 {
 public:
     enum
 {
 public:
     enum


@@ -235,7 +235,7 @@ private:
  * a help mechanism.
  */
 
  * a help mechanism.
  */
 

-class WXDLLEXPORT wxDialogLayoutAdapter: public wxObject
+class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject

 {
     DECLARE_CLASS(wxDialogLayoutAdapter)
 public:
 {
     DECLARE_CLASS(wxDialogLayoutAdapter)
 public:


@@ -253,7 +253,7 @@ public:
  *
  */
 
  *
  */
 

-class WXDLLEXPORT wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
+class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter

 {
     DECLARE_CLASS(wxStandardDialogLayoutAdapter)
 public:
 {
     DECLARE_CLASS(wxStandardDialogLayoutAdapter)
 public:


@@ -314,7 +314,7 @@ public:
     #elif defined(__WXGTK__)
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)
     #elif defined(__WXGTK__)
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)

-        #include "wx/mac/dialog.h"
+        #include "wx/osx/dialog.h"

     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)