Changed SetToolBar() to behave a bit smarter. Untested.
Removed some unused variables. More tests in scroll sample. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -78,7 +78,7 @@ public:
|
||||
const wxString& name = wxToolBarNameStr);
|
||||
virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
|
||||
virtual wxToolBar *GetToolBar() const;
|
||||
void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
|
||||
void SetToolBar(wxToolBar *toolbar);
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
virtual void SetMenuBar( wxMenuBar *menuBar );
|
||||
|
@@ -196,13 +196,7 @@ public:
|
||||
bool m_delayedFont:1;
|
||||
bool m_delayedForegroundColour:1;
|
||||
bool m_delayedBackgroundColour:1;
|
||||
bool m_delayedCursor:1;
|
||||
|
||||
// the cursor is set in OnInternalIdle(). this fields holds
|
||||
// a reference to the cursor currently set in theGdk window
|
||||
// so that we don't have to set it more than once
|
||||
wxCursor m_currentGdkCursor;
|
||||
|
||||
// contains GTK's widgets internal information about non-default widget
|
||||
// font and colours. we create one for each widget that gets any
|
||||
// non-default attribute set via SetFont() or SetForegroundColour() /
|
||||
|
Reference in New Issue
Block a user