more tweaks for release

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 042e3504dbcc7f0b83f92100736407d478b28bf6..e830d71c49f02a4ec44d70db14732a5bfb850b9b 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -3,21 +3,16 @@
 // Purpose:     wxFrame class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFrame class
 // Author:      David Webster
 // Modified by:

-// Created:     10/06/99
+// Created:     10/27/99

 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows licence
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 

-#ifdef __GNUG__
-#pragma interface "frame.h"
-#endif
-

 #include "wx/window.h"
 #include "wx/window.h"

-#include "wx/toolbar.h"

 #include "wx/os2/accel.h"
 #include "wx/icon.h"
 
 #include "wx/os2/accel.h"
 #include "wx/icon.h"
 


@@ -27,44 +22,37 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;

+class WXDLLEXPORT wxToolBar;

 
 

-class WXDLLEXPORT wxFrame: public wxWindow {
-
-  DECLARE_DYNAMIC_CLASS(wxFrame)
+class WXDLLEXPORT wxFrame : public wxWindow
+{
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 
 public:
     wxFrame();
 
 public:
     wxFrame();

-    inline wxFrame( wxWindow*       parent
-                   ,wxWindowID      id
-                   ,const wxString& title
-                   ,const wxPoint&  pos = wxDefaultPosition
-                   ,const wxSize&   size = wxDefaultSize
-                   ,long            style = wxDEFAULT_FRAME_STYLE
-                   ,const wxString& name = wxFrameNameStr
-                  )
+    wxFrame(wxWindow *parent,
+        wxWindowID id,
+        const wxString& title,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxDEFAULT_FRAME_STYLE,
+        const wxString& name = wxFrameNameStr)

     {
         Create(parent, id, title, pos, size, style, name);
     }
 
     ~wxFrame();
 
     {
         Create(parent, id, title, pos, size, style, name);
     }
 
     ~wxFrame();
 

-    bool Create( wxWindow*       parent
-                ,wxWindowID      id
-                ,const wxString& title
-                ,const wxPoint&  pos = wxDefaultPosition
-                ,const wxSize&   size = wxDefaultSize
-                ,long            style = wxDEFAULT_FRAME_STYLE
-                ,const wxString& name = wxFrameNameStr
-               );
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);

 
     virtual bool Destroy();
 
 
     virtual bool Destroy();
 

-    virtual void ClientToScreen(int *x, int *y) const;
-    virtual void ScreenToClient(int *x, int *y) const;
-
-    void SetClientSize(int width, int height);
-    void GetClientSize(int *width, int *height) const;
-

     void OnSize(wxSizeEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);


@@ -74,13 +62,12 @@ public:
     bool Show(bool show);
 
     void DetachMenuBar();
     bool Show(bool show);
 
     void DetachMenuBar();

-

     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);

-    virtual wxMenuBar *GetMenuBar() const ;
+    virtual wxMenuBar *GetMenuBar() const;

 
     // Call this to simulate a menu command
 
     // Call this to simulate a menu command

-    inline bool Command(int id) { return ProcessCommand(id); }
+    bool Command(int id) { return ProcessCommand(id); }

 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);


@@ -185,6 +172,9 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
 
     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();
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();


@@ -210,7 +200,7 @@ protected:
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-    wxToolBar *           m_frameToolBar;
+    wxToolBar*            m_frameToolBar;

 #endif // wxUSE_TOOLBAR
 
 private:
 #endif // wxUSE_TOOLBAR
 
 private: