9a29ea6e63
The way wxBU_EXACTFIT is implemented in commit c1bb80987f
("Improve implementation of wxBU_EXACTFIT style for wxButton under wxGTK2",
2020-04-12) is too intrusive and disrupts button's appearance in some
themes. It should work better with themes if we reduce inner border in
a more GTK-compliant way by applying a dedicated GTK style to the button.
Closes #19081.
80 lines
2.6 KiB
C++
80 lines
2.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/button.h
|
|
// Purpose: wxGTK wxButton class declaration
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_BUTTON_H_
|
|
#define _WX_GTK_BUTTON_H_
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxButton
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
|
|
{
|
|
public:
|
|
wxButton() {}
|
|
wxButton(wxWindow *parent, wxWindowID id,
|
|
const wxString& label = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize, long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxASCII_STR(wxButtonNameStr))
|
|
{
|
|
Create(parent, id, label, pos, size, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxString& label = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize, long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxASCII_STR(wxButtonNameStr));
|
|
|
|
virtual wxWindow *SetDefault() wxOVERRIDE;
|
|
virtual void SetLabel( const wxString &label ) wxOVERRIDE;
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
static wxVisualAttributes
|
|
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
|
|
|
// helper to allow access to protected member from GTK callback
|
|
void MoveWindow(int x, int y, int width, int height) { DoMoveWindow(x, y, width, height); }
|
|
|
|
// called from GTK callbacks: they update the button state and call
|
|
// GTKUpdateBitmap()
|
|
void GTKMouseEnters();
|
|
void GTKMouseLeaves();
|
|
void GTKPressed();
|
|
void GTKReleased();
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
|
|
|
|
#if wxUSE_MARKUP
|
|
virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
|
|
#endif // wxUSE_MARKUP
|
|
|
|
private:
|
|
typedef wxButtonBase base_type;
|
|
|
|
// Return the GtkLabel used by this button.
|
|
GtkLabel *GTKGetLabel() const;
|
|
|
|
#ifndef __WXGTK3__
|
|
// To mark if special GTK style for buttons with wxBU_EXACTFIT flag
|
|
// was already defined.
|
|
static bool m_exactFitStyleDefined;
|
|
#endif // !__WXGTK3__
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxButton);
|
|
};
|
|
|
|
#endif // _WX_GTK_BUTTON_H_
|