don't redeclare vsscanf() for Windows compilers, the case of missing declaration...

[wxWidgets.git] / include / wx / mac / carbon / mdi.h

diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index 4e5d55fce4efdc7616a8958442504808b04b1060..39319b262b589b048dbc0ed8fa73f8b8697d53de 100644 (file)
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -16,12 +16,12 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

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

 
 

-class WXDLLEXPORT wxMDIClientWindow;
-class WXDLLEXPORT wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 
 

-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame

 {
   DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
 {
   DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 


@@ -106,11 +106,11 @@ protected:
     bool m_shouldBeShown;
 
 private:
     bool m_shouldBeShown;
 
 private:

-    friend class WXDLLEXPORT wxMDIChildFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame

 {
 DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 public:


@@ -162,7 +162,7 @@ protected:
  * of the children. Phew! So the children are sort of 'adopted'...
  */
 
  * of the children. Phew! So the children are sort of 'adopted'...
  */
 

-class WXDLLEXPORT wxMDIClientWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow

 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
  public: