adding constants

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

diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index f8285f16a43c1106b8c1594589474653d5e6cdf5..306c9ff2ecf65f985010096a7584b51e54abe0ce 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -12,17 +12,13 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "frame.h"
-#endif
-

 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/icon.h"
 
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/icon.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];

 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;


@@ -76,7 +72,6 @@ public:
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 

-    virtual void PositionToolBar();

     virtual void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 
     virtual void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 


@@ -86,8 +81,6 @@ public:
                                            long style = wxST_SIZEGRIP,
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
                                            long style = wxST_SIZEGRIP,
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);

-
-    virtual void PositionStatusBar();

 #endif // wxUSE_STATUSBAR
 
     // tooltip management
 #endif // wxUSE_STATUSBAR
 
     // tooltip management


@@ -101,10 +94,19 @@ public:
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 

+    void PositionBars();
+

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

+#if wxUSE_TOOLBAR
+    virtual void PositionToolBar();
+#endif
+#if wxUSE_STATUSBAR
+    virtual void PositionStatusBar();
+#endif
+

     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);