X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/018d3030cc3616223f598b750171f86eabdd3ed7..7ed24cb652413094e211940d7177d89e9fc805f5:/include/wx/os2/frame.h diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index 5e1be0b792..c79181518b 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 +17,7 @@ // #include "wx/os2/wxrsc.h" -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -66,7 +66,7 @@ public: // 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 ); @@ -81,7 +81,7 @@ public: // 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 ); @@ -125,8 +125,6 @@ public: void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; } #endif // tooltips - virtual void SendSizeEvent(void); - void SetClient(WXHWND c_Hwnd); void SetClient(wxWindow* c_Window); wxWindow *GetClient(); @@ -217,6 +215,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_