Add new wxCommandLinkButton class.
A command link button wraps a native MSW control under recent Windows versions and is implemented generically as a simple bitmap button elsewhere. In the future, GTK implementation should allow using a different font for the button label and its note. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -88,13 +88,17 @@ protected:
|
||||
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
|
||||
virtual void DoSetBitmapPosition(wxDirection dir);
|
||||
|
||||
// Increases the passed in size if necessary to account for the
|
||||
// button image, if any
|
||||
void AdjustForBitmapSize(wxSize& size) const;
|
||||
|
||||
class wxButtonImageData *m_imageData;
|
||||
|
||||
// true if the UAC symbol is shown
|
||||
bool m_authNeeded;
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
|
||||
};
|
||||
|
||||
#endif // _WX_BUTTON_H_
|
||||
|
74
include/wx/msw/commandlinkbutton.h
Normal file
74
include/wx/msw/commandlinkbutton.h
Normal file
@@ -0,0 +1,74 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/msw/commandlinkbutton.h
|
||||
// Purpose: wxCommandLinkButton class
|
||||
// Author: Rickard Westerlund
|
||||
// Created: 2010-06-11
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2010 wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_MSW_COMMANDLINKBUTTON_H_
|
||||
#define _WX_MSW_COMMANDLINKBUTTON_H_
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Command link button for wxMSW
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Derive from the generic version to be able to fall back to it during
|
||||
// run-time if the command link buttons are not supported by the system we're
|
||||
// running under.
|
||||
|
||||
class WXDLLIMPEXP_ADV wxCommandLinkButton : public wxGenericCommandLinkButton
|
||||
{
|
||||
public:
|
||||
wxCommandLinkButton () : wxGenericCommandLinkButton() { }
|
||||
|
||||
wxCommandLinkButton(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxString& mainLabel = wxEmptyString,
|
||||
const wxString& note = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxButtonNameStr)
|
||||
: wxGenericCommandLinkButton()
|
||||
{
|
||||
Create(parent, id, mainLabel, note, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxString& mainLabel = wxEmptyString,
|
||||
const wxString& note = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxButtonNameStr);
|
||||
|
||||
// overridden base class methods
|
||||
// -----------------------------
|
||||
|
||||
// do the same thing as in the generic case here
|
||||
virtual void SetLabel(const wxString& label)
|
||||
{
|
||||
SetMainLabelAndNote(label.BeforeFirst('\n'), label.AfterFirst('\n'));
|
||||
}
|
||||
|
||||
virtual void SetMainLabelAndNote(const wxString& mainLabel,
|
||||
const wxString& note);
|
||||
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
virtual bool HasNativeBitmap() const;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton);
|
||||
};
|
||||
|
||||
#endif // _WX_MSW_COMMANDLINKBUTTON_H_
|
@@ -736,6 +736,7 @@
|
||||
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
|
||||
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
|
||||
#define wxUSE_COMBOBOX 1 // wxComboBox
|
||||
#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
|
||||
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
|
||||
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
|
||||
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
|
||||
|
@@ -736,6 +736,7 @@
|
||||
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
|
||||
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
|
||||
#define wxUSE_COMBOBOX 1 // wxComboBox
|
||||
#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
|
||||
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
|
||||
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
|
||||
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
|
||||
|
Reference in New Issue
Block a user