projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GCC 4.0 (Apple 4059) is a little bit pickier than 3.3.
[wxWidgets.git]
/
include
/
wx
/
os2
/
frame.h
diff --git
a/include/wx/os2/frame.h
b/include/wx/os2/frame.h
index d05f166f99502d65a51684ab73a5dba9180c4cf0..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 licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
@@
-66,11
+66,15
@@
public:
// Toolbar
#if wxUSE_TOOLBAR
// 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
@@
-121,6
+125,8
@@
public:
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips
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();
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();