Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for wxUSE_TOOLBAR under MSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-15 00:33:05 +00:00
parent 03d84e7af8
commit a9b33d6bb4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/toolbar.h
View File

@@ -15,7 +15,7 @@
#include "wx/tbarbase.h" // the base class for all toolbars #include "wx/tbarbase.h" // the base class for all toolbars
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
#if !wxUSE_TOOLBAR_NATIVE #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
#include "wx/tbarsmpl.h" #include "wx/tbarsmpl.h"
class WXDLLEXPORT wxToolBar : public wxToolBarSimple class WXDLLEXPORT wxToolBar : public wxToolBarSimple
@@ -40,7 +40,7 @@
return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL, return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
shortHelpString, longHelpString); shortHelpString, longHelpString);
} }
// old form // old form
wxToolBarToolBase *AddTool wxToolBarToolBase *AddTool
( (
@@ -56,7 +56,7 @@
return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData, return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
shortHelpString, longHelpString); shortHelpString, longHelpString);
} }
// virtual overridden // virtual overridden
virtual wxToolBarToolBase *AddTool virtual wxToolBarToolBase *AddTool
( (
@@ -74,7 +74,7 @@
return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData, return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
shortHelpString, longHelpString); shortHelpString, longHelpString);
} }
private: private:
DECLARE_DYNAMIC_CLASS(wxToolBar) DECLARE_DYNAMIC_CLASS(wxToolBar)
}; };

4
src/univ/toolbar.cpp
View File

@@ -34,10 +34,10 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/univ/renderer.h"
#endif #endif
#include "wx/univ/renderer.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/image.h" #include "wx/image.h"