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

Correct bitmap_in_button code for wxUniversal, wxMOTIF and wxGTK1

Browse Source
This commit is contained in:
Jouk
2017-06-20 08:31:16 +02:00
parent dd3c62660b
commit edb60cfcda
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xrc/xh_tglbtn.cpp
View File

@@ -16,6 +16,10 @@
#if wxUSE_XRC && wxUSE_TOGGLEBTN #if wxUSE_XRC && wxUSE_TOGGLEBTN
# if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
# define wxHAVE_BITMAPS_IN_BUTTON 1
# endif
#include "wx/xrc/xh_tglbtn.h" #include "wx/xrc/xh_tglbtn.h"
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#include "wx/button.h" // solely for wxBU_EXACTFIT #include "wx/button.h" // solely for wxBU_EXACTFIT
@@ -35,7 +39,7 @@ wxObject *wxToggleButtonXmlHandler::DoCreateResource()
wxObject *control = m_instance; wxObject *control = m_instance;
#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) #ifdef wxHAVE_BITMAPS_IN_BUTTON
if (m_class == wxT("wxBitmapToggleButton")) if (m_class == wxT("wxBitmapToggleButton"))
{ {
@@ -78,16 +82,18 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
wxDefaultValidator, wxDefaultValidator,
GetName()); GetName());
#ifdef wxHAVE_BITMAPS_IN_BUTTON
if ( GetParamNode("bitmap") ) if ( GetParamNode("bitmap") )
{ {
button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON), button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON),
GetDirection("bitmapposition")); GetDirection("bitmapposition"));
} }
#endi
button->SetValue(GetBool( wxT("checked"))); button->SetValue(GetBool( wxT("checked")));
} }
#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) #ifdef wxHAVE_BITMAPS_IN_BUTTON
void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control) void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
{ {
wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton); wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton);