Catching up to new common class interfaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -85,9 +85,10 @@ protected:
|
||||
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
|
||||
|
||||
virtual wxToolBarToolBase* CreateTool( int vId
|
||||
,const wxBitmap& rBitmap1
|
||||
,const wxBitmap& rBitmap2
|
||||
,bool bToggle
|
||||
,const wxString& rsLabel
|
||||
,const wxBitmap& rBitmapNormal
|
||||
,const wxBitmap& rBitmapDisabled
|
||||
,wxItemKind vKind
|
||||
,wxObject* pClientData
|
||||
,const wxString& rShortHelpString
|
||||
,const wxString& rLongHelpString
|
||||
|
@@ -67,7 +67,7 @@ public:
|
||||
virtual void Restore(void);
|
||||
virtual void SendSizeEvent(void);
|
||||
virtual void SetIcon(const wxIcon& rIcon);
|
||||
inline virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
|
||||
virtual void SetIcons(const wxIconBundle& rIcons);
|
||||
|
||||
virtual bool Show(bool bShow = TRUE);
|
||||
virtual bool ShowFullScreen( bool bShow
|
||||
|
@@ -496,6 +496,7 @@ protected:
|
||||
bool m_bBackgroundTransparent:1;
|
||||
bool m_bMouseInWindow:1;
|
||||
bool m_bDoubleClickAllowed:1;
|
||||
bool m_bLastKeydownProcessed:1;
|
||||
bool m_bWinCaptured:1;
|
||||
WXDWORD m_dwExStyle;
|
||||
|
||||
|
Reference in New Issue
Block a user