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

use wxToggleButtonXmlHandler::DoCreateBitmapToggleButton on supoorted platforms only

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2010-05-27 13:45:06 +00:00
parent c631ad5452
commit 9015d579c8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/xrc/xh_tglbtn.h
View File

@@ -26,7 +26,9 @@ public:
protected: protected:
virtual void DoCreateToggleButton(wxObject *control); virtual void DoCreateToggleButton(wxObject *control);
#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
virtual void DoCreateBitmapToggleButton(wxObject *control); virtual void DoCreateBitmapToggleButton(wxObject *control);
#endif
}; };
#endif // wxUSE_XRC && wxUSE_TOGGLEBTN #endif // wxUSE_XRC && wxUSE_TOGGLEBTN

5
src/xrc/xh_tglbtn.cpp
View File

@@ -36,7 +36,7 @@ wxObject *wxToggleButtonXmlHandler::DoCreateResource()
wxObject *control = m_instance; wxObject *control = m_instance;
#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) #if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
if (m_class == wxT("wxBitmapToggleButton")) if (m_class == wxT("wxBitmapToggleButton"))
{ {
@@ -88,6 +88,7 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
button->SetValue(GetBool( wxT("checked"))); button->SetValue(GetBool( wxT("checked")));
} }
#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPALMOS__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control) void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
{ {
wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton); wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton);
@@ -102,5 +103,5 @@ void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control)
button->SetValue(GetBool( wxT("checked"))); button->SetValue(GetBool( wxT("checked")));
} }
#endif
#endif // wxUSE_XRC && wxUSE_TOGGLEBTN #endif // wxUSE_XRC && wxUSE_TOGGLEBTN