X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..053ac76fa2b4bd461c88258ab642f7804da88e80:/include/wx/frame.h diff --git a/include/wx/frame.h b/include/wx/frame.h index 3c2c3888d8..fe718971b7 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -19,8 +19,8 @@ #include "wx/toplevel.h" // the base class // the default names for various classs -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxMenuBar; @@ -50,7 +50,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow +class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow { public: // construction @@ -263,7 +263,7 @@ protected: #elif defined(__WXMOTIF__) #include "wx/motif/frame.h" #elif defined(__WXMAC__) - #include "wx/mac/frame.h" + #include "wx/osx/frame.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/frame.h" #elif defined(__WXPM__)