X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..e90196a556e288234cacf7e5166f3f4a6d971175:/include/wx/os2/frame.h

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 7dfaf63fc6..e830d71c49 100644
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -1,24 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.h
 // Purpose:     wxFrame class
-// Author:      Julian Smart
+// Author:      David Webster
 // Modified by:
-// Created:     01/02/97
+// Created:     10/27/99
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) David Webster
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-#ifdef __GNUG__
-    #pragma interface "frame.h"
-#endif
-
 #include "wx/window.h"
-#include "wx/toolbar.h"
-#include "wx/msw/accel.h"
+#include "wx/os2/accel.h"
 #include "wx/icon.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
@@ -27,6 +22,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
+class WXDLLEXPORT wxToolBar;
 
 class WXDLLEXPORT wxFrame : public wxWindow
 {
@@ -57,9 +53,6 @@ public:
 
     virtual bool Destroy();
 
-    virtual void ClientToScreen(int *x, int *y) const;
-    virtual void ScreenToClient(int *x, int *y) const;
-
     void OnSize(wxSizeEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
@@ -68,6 +61,7 @@ public:
 
     bool Show(bool show);
 
+    void DetachMenuBar();
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const;
@@ -160,7 +154,7 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
-    bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
+    bool OS2Create(int id, wxWindow *parent, const wxChar *wclass,
                    wxWindow *wx_win, const wxChar *title,
                    int x, int y, int width, int height, long style);
 
@@ -176,11 +170,11 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetPosition(int *x, int *y) const;
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
+    virtual void DoClientToScreen(int *x, int *y) const;
+    virtual void DoScreenToClient(int *x, int *y) const;
+
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();
@@ -189,10 +183,10 @@ protected:
     void IconizeChildFrames(bool bIconize);
 
     // we add menu bar accel processing
-    bool MSWTranslateMessage(WXMSG* pMsg);
+    bool OS2TranslateMessage(WXMSG* pMsg);
 
     // window proc for the frames
-    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     wxMenuBar *           m_frameMenuBar;
     wxIcon                m_icon;
@@ -206,7 +200,7 @@ protected:
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
-    wxToolBar *           m_frameToolBar;
+    wxToolBar*            m_frameToolBar;
 #endif // wxUSE_TOOLBAR
 
 private:
@@ -219,3 +213,4 @@ private:
 
 #endif
     // _WX_FRAME_H_
+