compilation fix (no C++ comments in C files, include/wx/expr.hsrc/msw/textctrl.cpp...

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 042e3504dbcc7f0b83f92100736407d478b28bf6..bdb35dcdc964a875c34d2624137001e42c172bf1 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -3,93 +3,61 @@
 // 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/toolbar.h"
-#include "wx/os2/accel.h"
-#include "wx/icon.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
-
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxStatusBar;
-
-class WXDLLEXPORT wxFrame: public wxWindow {
-
-  DECLARE_DYNAMIC_CLASS(wxFrame)
-
+class WXDLLEXPORT wxFrame : public wxFrameBase
+{

 public:
 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
-                  )
+    // construction
+    wxFrame() { Init(); }
+    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)

     {
     {

+        Init();
+

         Create(parent, id, title, pos, size, style, name);
     }
 
         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 ~wxFrame();

 
 

-    virtual bool Destroy();
+    // implement base class pure virtuals
+    virtual void Maximize(bool maximize = TRUE);
+    virtual bool IsMaximized() const;
+    virtual void Iconize(bool iconize = TRUE);
+    virtual bool IsIconized() const;
+    virtual void Restore();
+    virtual void SetMenuBar(wxMenuBar *menubar);
+    virtual void SetIcon(const wxIcon& icon);

 
 

-    virtual void ClientToScreen(int *x, int *y) const;
-    virtual void ScreenToClient(int *x, int *y) const;
+    // implementation only from now on
+    // -------------------------------

 
 

-    void SetClientSize(int width, int height);
-    void GetClientSize(int *width, int *height) const;
+    // override some more virtuals
+    virtual bool Show(bool show = TRUE);

 
 

-    void OnSize(wxSizeEvent& event);
-    void OnMenuHighlight(wxMenuEvent& event);
+    // event handlers

     void OnActivate(wxActivateEvent& event);
     void OnActivate(wxActivateEvent& event);

-    void OnIdle(wxIdleEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    bool Show(bool show);
-
-    void DetachMenuBar();
-
-    // Set menu bar
-    void SetMenuBar(wxMenuBar *menu_bar);
-    virtual wxMenuBar *GetMenuBar() const ;
-
-    // Call this to simulate a menu command
-    inline bool Command(int id) { return ProcessCommand(id); }
-
-    // process menu command: returns TRUE if processed
-    bool ProcessCommand(int id);
-
-    // make the window modal (all other windows unresponsive)
-    virtual void MakeModal(bool modal = TRUE);
-
-    // Set icon
-    virtual void SetIcon(const wxIcon& icon);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
     // Toolbar
 #if wxUSE_TOOLBAR
 
     // Toolbar
 #if wxUSE_TOOLBAR


@@ -97,71 +65,36 @@ public:
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 

-    virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
-
-    virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
-    virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
-

     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 

-#if wxUSE_STATUSBAR

     // Status bar
     // Status bar

-    virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_SIZEGRIP,
-                                         wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
-
-    wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
-    void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
+#if wxUSE_STATUSBAR
+    virtual wxStatusBar* OnCreateStatusBar(int number = 1,
+                                           long style = wxST_SIZEGRIP,
+                                           wxWindowID id = 0,
+                                           const wxString& name = wxStatusLineNameStr);

 
     virtual void PositionStatusBar();
 
     virtual void PositionStatusBar();

-    virtual wxStatusBar *OnCreateStatusBar(int number,
-                                           long style,
-                                           wxWindowID id,
-                                           const wxString& name);

 
 

-    // Set status line text
-    virtual void SetStatusText(const wxString& text, int number = 0);
+    // Hint to tell framework which status bar to use: the default is to use
+    // native one for the platforms which support it (Win32), the generic one
+    // otherwise

 
 

-    // Set status line widths
-    virtual void SetStatusWidths(int n, const int widths_field[]);
-
-    // Hint to tell framework which status bar to use

     // TODO: should this go into a wxFrameworkSettings class perhaps?
     // TODO: should this go into a wxFrameworkSettings class perhaps?

-    static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
-    static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
+    static void UseNativeStatusBar(bool useNative)
+        { m_useNativeStatusBar = useNative; };
+    static bool UsesNativeStatusBar()
+        { return m_useNativeStatusBar; };

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

-    // Iconize
-    virtual void Iconize(bool iconize);
-
-    virtual bool IsIconized() const;
-
-    // Is it maximized?
-    virtual bool IsMaximized() const;
-
-    // Compatibility
-    bool Iconized() const { return IsIconized(); }
-
-    virtual void Maximize(bool maximize);
-    //  virtual bool LoadAccelerators(const wxString& table);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // Query app for menu item updates (called from OnIdle)
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
-

     WXHMENU GetWinMenu() const { return m_hMenu; }
 
     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 
     // Returns the origin of client area (may be different from (0,0) if the
     // frame has a toolbar)
     virtual wxPoint GetClientAreaOrigin() const;
 

-    // Implementation only from here
-        // event handlers
+    // event handlers

     bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);


@@ -171,13 +104,19 @@ public:
                    wxWindow *wx_win, const wxChar *title,
                    int x, int y, int width, int height, long style);
 
                    wxWindow *wx_win, const wxChar *title,
                    int x, int y, int width, int height, long style);
 

-  // tooltip management
+    // tooltip management

 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
 protected:
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
 protected:

+    // common part of all ctors
+    void Init();
+
+    // common part of Iconize(), Maximize() and Restore()
+    void DoShowWindow(int nShowCmd);
+

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


@@ -185,6 +124,12 @@ 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;
+
+    // helper
+    void DetachMenuBar();
+

     // 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();


@@ -198,27 +143,20 @@ protected:
     // window proc for the frames
     MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // window proc for the frames
     MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

-    wxMenuBar *           m_frameMenuBar;
-    wxIcon                m_icon;

     bool                  m_iconized;
     WXHICON               m_defaultIcon;
 
 #if wxUSE_STATUSBAR
     bool                  m_iconized;
     WXHICON               m_defaultIcon;
 
 #if wxUSE_STATUSBAR

-    wxStatusBar *         m_frameStatusBar;
-

     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 

-#if wxUSE_TOOLBAR
-    wxToolBar *           m_frameToolBar;
-#endif // wxUSE_TOOLBAR
-

 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()
 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif