rename wxGrid::SendSizeEvent() to SendGridSizeEvent() to avoid warnings about conflic...

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 7c34ac348002e3384024afd7558c67bf81d41760..5555122df42fb2070d9bacfb55c1bcde59b2f9d4 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -14,14 +14,14 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

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

 
 

-class WXDLLEXPORT wxDialogModalData;
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;

 
 //
 // Dialog boxes
 //
 
 //
 // Dialog boxes
 //

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

 {
 public:
 
 {
 public:
 


@@ -122,7 +122,7 @@ private:
     class wxWindowDisabler*         m_pWindowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     class wxWindowDisabler*         m_pWindowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)

-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);

 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_