1. wxMotif fixes for compilation in "no compatible" mode
2. Common fixes to be able to link minimal sample without stream classes, tree ctrl, list ctrl &c git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -114,12 +114,14 @@ public:
|
||||
const wxString& name);
|
||||
|
||||
// Create toolbar
|
||||
#if wxUSE_TOOLBAR
|
||||
virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
|
||||
virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
|
||||
// If made known to the frame, the frame will manage it automatically.
|
||||
virtual void SetToolBar(wxToolBar *toolbar) ;
|
||||
virtual wxToolBar *GetToolBar() const ;
|
||||
virtual void PositionToolBar();
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
// Set status line text
|
||||
virtual void SetStatusText(const wxString& text, int number = 0);
|
||||
@@ -188,7 +190,10 @@ protected:
|
||||
wxIcon m_icon;
|
||||
bool m_iconized;
|
||||
static bool m_useNativeStatusBar;
|
||||
|
||||
#if wxUSE_TOOLBAR
|
||||
wxToolBar * m_frameToolBar ;
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
//// Motif-specific
|
||||
|
||||
|
Reference in New Issue
Block a user