X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9dae7798b164a5f4abc85d16f49cabd4e0980c0..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/os2/frame.h?ds=inline diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index f8bd78661c..ed91205802 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.h +// Name: wx/os2/frame.h // Purpose: wxFrame class // Author: David Webster // Modified by: @@ -17,7 +17,7 @@ // #include "wx/os2/wxrsc.h" -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -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 ); @@ -93,9 +93,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; } @@ -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_