projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Got rid of some wierd VisualAge debug nonsense that had appeared in this after the...
[wxWidgets.git]
/
src
/
msw
/
tbarmsw.cpp
diff --git
a/src/msw/tbarmsw.cpp
b/src/msw/tbarmsw.cpp
index e7ab1de5c87d69df24b349dd1bf6164f9a55ef9f..e51c302c1c0e86e44f4ec6dcb24114749c48435a 100644
(file)
--- a/
src/msw/tbarmsw.cpp
+++ b/
src/msw/tbarmsw.cpp
@@
-32,7
+32,7
@@
#include "wx/wx.h"
#endif
#include "wx/wx.h"
#endif
-#if wxUSE_
BUTTONBAR && wxUSE_TOOLBAR && !wxUSE_TOOLBAR_SIMPLE
+#if wxUSE_
TOOLBAR && defined(__WIN16__)
#if !defined(__WIN32__) && !wxUSE_IMAGE_LOADING_IN_MSW
#error wxToolBar needs wxUSE_IMAGE_LOADING_IN_MSW under Win16
#if !defined(__WIN32__) && !wxUSE_IMAGE_LOADING_IN_MSW
#error wxToolBar needs wxUSE_IMAGE_LOADING_IN_MSW under Win16
@@
-48,7
+48,7
@@
#include <stdlib.h>
#include <stdlib.h>
-#include "wx/tbarmsw.h"
+#include "wx/
msw/
tbarmsw.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/bitmap.h"
@@
-119,7
+119,7
@@
public:
// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
Control
)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
ToolBarBase
)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_PAINT(wxToolBar::OnPaint)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_PAINT(wxToolBar::OnPaint)
@@
-491,7
+491,7
@@
bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
// TODO: use the mapping code from wxToolBar95 to get it right in this class
#if !defined(__WIN32__) && !defined(__WIN386__)
wxBitmap bitmap2;
// TODO: use the mapping code from wxToolBar95 to get it right in this class
#if !defined(__WIN32__) && !defined(__WIN386__)
wxBitmap bitmap2;
- if (to
ggle
)
+ if (to
ol->CanBeToggled()
)
{
HBITMAP hbmp = CreateMappedBitmap((WXHINSTANCE)wxGetInstance(),
GetHbitmapOf(tool->GetBitmap1()));
{
HBITMAP hbmp = CreateMappedBitmap((WXHINSTANCE)wxGetInstance(),
GetHbitmapOf(tool->GetBitmap1()));
@@
-747,8
+747,11
@@
void wxToolBar::DrawBlankButton(WXHDC hdc, int x, int y, int dx, int dy, int sta
}
}
}
}
-void wxToolBar::DrawButton(WXHDC hdc, int x, int y, int dx, int dy, wxToolBarTool *tool, int state)
+void wxToolBar::DrawButton(WXHDC hdc, int x, int y, int dx, int dy,
+ wxToolBarToolBase *toolBase, int state)
{
{
+ wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+
int yOffset;
HBRUSH hbrOld, hbr;
BOOL bMaskCreated = FALSE;
int yOffset;
HBRUSH hbrOld, hbr;
BOOL bMaskCreated = FALSE;