Applied [ 716064 ] Second part of wxFileCtrl & wxDirCtrl patch

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

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 6434553ebed9338030dc413f17cc03b768ed77c3..44038e6ddd101be1f74f18949dde90b9c7b3018e 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
 // Purpose:     wxFrame class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
 // Purpose:     wxFrame class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -21,8 +21,8 @@
 #include "wx/accel.h"
 #include "wx/icon.h"
 
 #include "wx/accel.h"
 #include "wx/icon.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) 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;


@@ -113,6 +113,9 @@ protected:
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
 

+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+

 protected:
 #if wxUSE_STATUSBAR
     static bool           m_useNativeStatusBar;
 protected:
 #if wxUSE_STATUSBAR
     static bool           m_useNativeStatusBar;