X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b82186f0e7f3d3b6cf24f6ad12fda647dd9b4ec0..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/frame.h?ds=sidebyside diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index 88cac74d0f..e337086b95 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -1,12 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.h +// Name: wx/os2/frame.h // Purpose: wxFrame class // Author: David Webster // Modified by: // Created: 10/27/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FRAME_H_ @@ -17,7 +16,7 @@ // #include "wx/os2/wxrsc.h" -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -62,23 +61,26 @@ public: virtual void Raise(void); // event handlers - void OnActivate(wxActivateEvent& rEvent); 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 ); + virtual wxToolBar* OnCreateToolBar( long lStyle + ,wxWindowID vId + ,const wxString& rsName + ); virtual void PositionToolBar(void); #endif // wxUSE_TOOLBAR // Status bar #if wxUSE_STATUSBAR virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1 - ,long lStyle = wxST_SIZEGRIP + ,long lStyle = wxSTB_DEFAULT_STYLE ,wxWindowID vId = 0 ,const wxString& rsName = wxStatusLineNameStr ); @@ -90,9 +92,9 @@ public: // TODO: should this go into a wxFrameworkSettings class perhaps? static void UseNativeStatusBar(bool bUseNative) - { m_bUseNativeStatusBar = bUseNative; }; + { m_bUseNativeStatusBar = bUseNative; } static bool UsesNativeStatusBar() - { return m_bUseNativeStatusBar; }; + { return m_bUseNativeStatusBar; } #endif // wxUSE_STATUSBAR WXHMENU GetWinMenu() const { return m_hMenu; } @@ -122,12 +124,6 @@ public: 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; } - void SetClient(WXHWND c_Hwnd); void SetClient(wxWindow* c_Window); wxWindow *GetClient(); @@ -188,7 +184,6 @@ protected: bool m_bFsIsShowing; bool m_bWasMinimized; bool m_bIsShown; - wxWindow* m_pWinLastFocused; private: #if wxUSE_TOOLTIPS @@ -219,6 +214,8 @@ private: DECLARE_DYNAMIC_CLASS(wxFrame) }; +MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); +MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); #endif // _WX_FRAME_H_