fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / cocoa / frame.h

diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h
index c7f886ade56fa8ffb6da7552532826489dd4ca75..417f57080de0f1640efbf4fc7489170beefbda5b 100644 (file)
--- a/include/wx/cocoa/frame.h
+++ b/include/wx/cocoa/frame.h
@@ -12,10 +12,10 @@
 #ifndef _WX_COCOA_FRAME_H_
 #define _WX_COCOA_FRAME_H_
 
 #ifndef _WX_COCOA_FRAME_H_
 #define _WX_COCOA_FRAME_H_
 

-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxStatusBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxStatusBar;

 
 

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

 {
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 {
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)


@@ -86,7 +86,7 @@ public:
 
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,
 
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,

-                                         long style = wxST_SIZEGRIP,
+                                         long style = wxSTB_DEFAULT_STYLE,

                                          wxWindowID winid = 0,
                                          const wxString& name =
                                             wxStatusLineNameStr);
                                          wxWindowID winid = 0,
                                          const wxString& name =
                                             wxStatusLineNameStr);