OGL samples again buildable after deprecated/setup.h turned off by default. Minor cleaning where applicable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,19 +18,13 @@
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/deprecated/tbarsmpl.h>
|
||||
#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
|
||||
|
||||
/*
|
||||
* Object editor tool palette
|
||||
*
|
||||
*/
|
||||
|
||||
// TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
|
||||
// Needs to have a parent window...
|
||||
// So use a simple toolbar at present.
|
||||
// ABX: Simple toolbar is not available in default compilation and is deprecated
|
||||
// so I use wxToolBar anyway
|
||||
// #define TOOLPALETTECLASS wxToolBarSimple
|
||||
#define TOOLPALETTECLASS wxToolBar
|
||||
|
||||
class csEditorToolPalette: public TOOLPALETTECLASS
|
||||
|
Reference in New Issue
Block a user