removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,9 +33,6 @@
|
||||
#include "wx/image.h"
|
||||
#include "wx/filedlg.h"
|
||||
|
||||
// define this to 1 to use wxToolBarSimple instead of the native one
|
||||
#define USE_GENERIC_TBAR 0
|
||||
|
||||
// define this to use XPMs everywhere (by default, BMPs are used under Win)
|
||||
// BMPs use less space, but aren't compiled into the executable on other platforms
|
||||
#ifdef __WXMSW__
|
||||
@@ -44,15 +41,6 @@
|
||||
#define USE_XPM_BITMAPS 1
|
||||
#endif
|
||||
|
||||
#if USE_GENERIC_TBAR
|
||||
#if !wxUSE_TOOLBAR_SIMPLE
|
||||
#error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
|
||||
to 1 in setup.h and recompile the library.
|
||||
#else
|
||||
#include "wx/tbarsmpl.h"
|
||||
#endif
|
||||
#endif // USE_GENERIC_TBAR
|
||||
|
||||
#if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
|
||||
#error You need to enable XPM support to use XPM bitmaps with toolbar!
|
||||
#endif // USE_XPM_BITMAPS
|
||||
@@ -136,12 +124,6 @@ public:
|
||||
void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event)
|
||||
{ event.Enable( m_tbar != NULL ); }
|
||||
|
||||
#if USE_GENERIC_TBAR
|
||||
virtual wxToolBar *OnCreateToolBar(long style,
|
||||
wxWindowID id,
|
||||
const wxString& name );
|
||||
#endif // USE_GENERIC_TBAR
|
||||
|
||||
private:
|
||||
void DoEnablePrint();
|
||||
void DoDeletePrint();
|
||||
@@ -376,7 +358,7 @@ void MyFrame::RecreateToolbar()
|
||||
toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
|
||||
|
||||
// the generic toolbar doesn't really support this
|
||||
#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
|
||||
#if wxUSE_TOOLBAR_NATIVE && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
|
||||
// adding a combo to a vertical toolbar is not very smart
|
||||
if ( m_horzToolbar )
|
||||
{
|
||||
@@ -551,19 +533,6 @@ MyFrame::MyFrame(wxFrame* parent,
|
||||
m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
|
||||
}
|
||||
|
||||
#if USE_GENERIC_TBAR
|
||||
|
||||
wxToolBar* MyFrame::OnCreateToolBar(long style,
|
||||
wxWindowID id,
|
||||
const wxString& name)
|
||||
{
|
||||
return (wxToolBar *)new wxToolBarSimple(this, id,
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
style, name);
|
||||
}
|
||||
|
||||
#endif // USE_GENERIC_TBAR
|
||||
|
||||
void MyFrame::LayoutChildren()
|
||||
{
|
||||
wxSize size = GetClientSize();
|
||||
|
Reference in New Issue
Block a user