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

Mostly Mingw32/Cygwin corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-12-20 19:04:48 +00:00
parent 83307f338d
commit c25a510b30
19 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/tbarmsw.cpp
View File

@@ -32,7 +32,7 @@
#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
@@ -48,7 +48,7 @@
#include <stdlib.h>
#include "wx/tbarmsw.h"
#include "wx/msw/tbarmsw.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/bitmap.h"
@@ -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;
if (toggle)
if (tool->CanBeToggled())
{
HBITMAP hbmp = CreateMappedBitmap((WXHINSTANCE)wxGetInstance(),
GetHbitmapOf(tool->GetBitmap1()));