solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Change wxBitmap to wxBitmapBundle in wxBitmapToggleButton

Browse source
This commit is contained in:
Alexander Koshelev 2022-01-13 15:48:01 +03:00 • committed by Vadim Zeitlin
parent b2629a97e5
commit 85becc9362
9 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wx/gtk/tglbtn.h
View file

@ -12,7 +12,7 @@
#ifndef _WX_GTK_TOGGLEBUTTON_H_ #ifndef _WX_GTK_TOGGLEBUTTON_H_
#define _WX_GTK_TOGGLEBUTTON_H_ #define _WX_GTK_TOGGLEBUTTON_H_
#include "wx/bitmap.h" #include "wx/bmpbndl.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToggleButton // wxToggleButton
@ -85,7 +85,7 @@ public:
wxBitmapToggleButton() {} wxBitmapToggleButton() {}
wxBitmapToggleButton(wxWindow *parent, wxBitmapToggleButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@ -98,7 +98,7 @@ public:
// Create the control // Create the control
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,

6
include/wx/msw/tglbtn.h
View file

@ -12,7 +12,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
#include "wx/bitmap.h" #include "wx/bmpbndl.h"
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
@ -77,7 +77,7 @@ public:
wxBitmapToggleButton() {} wxBitmapToggleButton() {}
wxBitmapToggleButton(wxWindow *parent, wxBitmapToggleButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@ -90,7 +90,7 @@ public:
// Create the control // Create the control
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,

4
include/wx/osx/tglbtn.h
View file

@ -58,7 +58,7 @@ public:
wxBitmapToggleButton() {} wxBitmapToggleButton() {}
wxBitmapToggleButton(wxWindow *parent, wxBitmapToggleButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@ -70,7 +70,7 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,

4
include/wx/qt/tglbtn.h
View file

@ -51,7 +51,7 @@ public:
wxBitmapToggleButton(); wxBitmapToggleButton();
wxBitmapToggleButton(wxWindow *parent, wxBitmapToggleButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@ -60,7 +60,7 @@ public:
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,

4
interface/wx/tglbtn.h
View file

@ -139,7 +139,7 @@ public:
Internally calls Create(). Internally calls Create().
*/ */
wxBitmapToggleButton(wxWindow* parent, wxWindowID id, wxBitmapToggleButton(wxWindow* parent, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@ -150,7 +150,7 @@ public:
Create method for two-step construction. Create method for two-step construction.
*/ */
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,

2
src/gtk/tglbtn.cpp
View file

@ -50,7 +50,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton); wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap &bitmap, const wxPoint &pos, const wxBitmapBundle &bitmap, const wxPoint &pos,
const wxSize &size, long style, const wxSize &size, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString &name) const wxString &name)

2
src/msw/tglbtn.cpp
View file

@ -54,7 +54,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton); wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id, bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
const wxBitmap& label,const wxPoint& pos, const wxSize& size, long style, const wxBitmapBundle& label,const wxPoint& pos, const wxSize& size, long style,
const wxValidator& validator, const wxString& name ) const wxValidator& validator, const wxString& name )
{ {
if (!wxToggleButton::Create( parent, id, wxEmptyString, pos, size, style, validator, name )) if (!wxToggleButton::Create( parent, id, wxEmptyString, pos, size, style, validator, name ))

2
src/osx/tglbtn_osx.cpp
View file

@ -107,7 +107,7 @@ bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton); wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, long style, const wxSize& size, long style,
const wxValidator& validator, const wxValidator& validator,

4
src/qt/tglbtn.cpp
View file

@ -30,7 +30,7 @@ wxBitmapToggleButton::wxBitmapToggleButton()
wxBitmapToggleButton::wxBitmapToggleButton(wxWindow *parent, wxBitmapToggleButton::wxBitmapToggleButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
@ -42,7 +42,7 @@ wxBitmapToggleButton::wxBitmapToggleButton(wxWindow *parent,
bool wxBitmapToggleButton::Create(wxWindow *parent, bool wxBitmapToggleButton::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& label, const wxBitmapBundle& label,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, long style, const wxSize& size, long style,
const wxValidator& validator, const wxValidator& validator,