fixed library order (important for static linking under Unix

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 23785ee564fd212b7ec437b99247ae366242b47e..f8bd78661c1b8dd62abb743b3f93fd13f60f2bfe 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -6,7 +6,7 @@
 // Created:     10/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

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

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


@@ -15,7 +15,7 @@
 //
 // Get the default resource ID's for frames
 //
 //
 // Get the default resource ID's for frames
 //

-#include "wx/os2/wxOs2.h"
+#include "wx/os2/wxrsc.h"

 
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {


@@ -23,13 +23,13 @@ public:
     // construction
     wxFrame() { Init(); }
     wxFrame( wxWindow*       pParent
     // construction
     wxFrame() { Init(); }
     wxFrame( wxWindow*       pParent

-            ,wxWindowID      vId
-            ,const wxString& rsTitle
-            ,const wxPoint&  rPos = wxDefaultPosition
-            ,const wxSize&   rSize = wxDefaultSize
-            ,long            lStyle = wxDEFAULT_FRAME_STYLE
-            ,const wxString& rsName = wxFrameNameStr
-           )
+               ,wxWindowID      vId
+               ,const wxString& rsTitle
+               ,const wxPoint&  rPos = wxDefaultPosition
+               ,const wxSize&   rSize = wxDefaultSize
+               ,long            lStyle = wxDEFAULT_FRAME_STYLE
+               ,const wxString& rsName = wxFrameNameStr
+              )

     {
         Init();
 
     {
         Init();
 


@@ -48,36 +48,33 @@ public:
     virtual ~wxFrame();
 
     // implement base class pure virtuals
     virtual ~wxFrame();
 
     // implement base class pure virtuals

-    virtual void Maximize(bool bMaximize = TRUE);
-    virtual bool IsMaximized(void) const;
-    virtual void Iconize(bool bIconize = TRUE);
-    virtual bool IsIconized(void) const;
-    virtual void Restore(void);
+#if wxUSE_MENUS_NATIVE

     virtual void SetMenuBar(wxMenuBar* pMenubar);
     virtual void SetMenuBar(wxMenuBar* pMenubar);

-    virtual void SetIcon(const wxIcon& rIcon);
+#endif

     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
                                );
     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
                                );

-    virtual bool IsFullScreen(void) const { return m_bFsIsShowing; };

 
 
     // implementation only from now on
     // -------------------------------
 
 
 
     // implementation only from now on
     // -------------------------------
 

-    // override some more virtuals
-    virtual bool Show(bool bShow = TRUE);
+    virtual void Raise(void);

 
     // event handlers
 
     // event handlers

-    void OnActivate(wxActivateEvent& rEvent);

     void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
 
     // Toolbar
 #if wxUSE_TOOLBAR
     void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
 
     // Toolbar
 #if wxUSE_TOOLBAR

-    virtual wxToolBar* CreateToolBar( long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT
+    virtual wxToolBar* CreateToolBar( long            lStyle = -1

                                      ,wxWindowID      vId = -1
                                      ,const wxString& rsName = wxToolBarNameStr
                                     );
 
                                      ,wxWindowID      vId = -1
                                      ,const wxString& rsName = wxToolBarNameStr
                                     );
 

+    virtual wxToolBar* OnCreateToolBar( long            lStyle
+                                       ,wxWindowID      vId
+                                       ,const wxString& rsName
+                                      );

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


@@ -122,34 +119,17 @@ public:
                           ,WXHMENU hMenu
                          );
 
                           ,WXHMENU hMenu
                          );
 

-    bool OS2Create( int           nId
-                   ,wxWindow*     pParent
-                   ,const wxChar* zWclass
-                   ,wxWindow*     pWxWin
-                   ,const wxChar* zTitle
-                   ,int           nX
-                   ,int           nY
-                   ,int           nWidth
-                   ,int           nHeight
-                   ,long          nStyle
-                  );
-

     // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
     void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
 #endif // tooltips
 
     // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
     void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
 #endif // tooltips
 

-    //
-    // Called by wxWindow whenever it gets focus
-    //
-    void SetLastFocus(wxWindow* pWin) { m_pWinLastFocused = pWin; }
-    wxWindow *GetLastFocus(void) const { return m_pWinLastFocused; }
+    virtual void SendSizeEvent(void);

 
     void      SetClient(WXHWND    c_Hwnd);
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();
 
     void      SetClient(WXHWND    c_Hwnd);
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();

-    HWND      GetFrame(void) const { return m_hFrame; }

 
  friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
  friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
 
  friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
  friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);


@@ -158,30 +138,25 @@ protected:
     // common part of all ctors
     void         Init(void);
 
     // common part of all ctors
     void         Init(void);
 

-    // common part of Iconize(), Maximize() and Restore()
-    void         DoShowWindow(int nShowCmd);
-
+    virtual WXHICON GetDefaultIcon(void) const;

     // override base class virtuals
     virtual void DoGetClientSize( int* pWidth
                                  ,int* pHeight
                                 ) const;
     // override base class virtuals
     virtual void DoGetClientSize( int* pWidth
                                  ,int* pHeight
                                 ) const;

-    virtual void DoGetSize( int* pWidth
-                           ,int* pHeight
-                          ) const;
-    virtual void DoGetPosition( int* pX
-                               ,int* pY
-                              ) const;

     virtual void DoSetClientSize( int nWidth
                                  ,int nWeight
                                 );
     virtual void DoSetClientSize( int nWidth
                                  ,int nWeight
                                 );

+    inline virtual bool IsMDIChild(void) const { return FALSE; }

 
 

+#if wxUSE_MENUS_NATIVE

     // helper
     void         DetachMenuBar(void);
     // helper
     void         DetachMenuBar(void);

-
+    // perform MSW-specific action when menubar is changed
+    virtual void AttachMenuBar(wxMenuBar* pMenubar);

     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar(void);
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar(void);

-
+#endif

     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
 
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
 


@@ -210,8 +185,8 @@ protected:
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;

+    bool                            m_bWasMinimized;

     bool                            m_bIsShown;
     bool                            m_bIsShown;

-    wxWindow*                       m_pWinLastFocused;

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS


@@ -223,7 +198,6 @@ private:
     // that we don't have child objects for (m_hWnd in wxWindow is the
     // handle of the Frame's client window!
     //
     // that we don't have child objects for (m_hWnd in wxWindow is the
     // handle of the Frame's client window!
     //

-    WXHWND                          m_hFrame;

     WXHWND                          m_hTitleBar;
     WXHWND                          m_hHScroll;
     WXHWND                          m_hVScroll;
     WXHWND                          m_hTitleBar;
     WXHWND                          m_hHScroll;
     WXHWND                          m_hVScroll;


@@ -232,8 +206,6 @@ private:
     // Swp structures for various client data
     // DW: Better off in attached RefData?
     //
     // Swp structures for various client data
     // DW: Better off in attached RefData?
     //

-    SWP                             m_vSwp;
-    SWP                             m_vSwpClient;

     SWP                             m_vSwpTitleBar;
     SWP                             m_vSwpMenuBar;
     SWP                             m_vSwpHScroll;
     SWP                             m_vSwpTitleBar;
     SWP                             m_vSwpMenuBar;
     SWP                             m_vSwpHScroll;