/////////////////////////////////////////////////////////////////////////////
-// Name: control.h
+// Name: wx/gtk/control.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef __GTKCONTROLH__
-#define __GTKCONTROLH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/window.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControl;
+#ifndef _WX_GTK_CONTROL_H_
+#define _WX_GTK_CONTROL_H_
typedef struct _GtkLabel GtkLabel;
typedef struct _GtkFrame GtkFrame;
// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
extern "C" {
typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
- typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
+ typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);
typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
}
class WXDLLIMPEXP_CORE wxControl : public wxControlBase
{
+ typedef wxControlBase base_type;
public:
wxControl();
wxControl(wxWindow *parent, wxWindowID id,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr);
- virtual void SetLabel( const wxString &label );
- virtual wxString GetLabel() const;
-
virtual wxVisualAttributes GetDefaultAttributes() const;
+#ifdef __WXGTK3__
+ virtual bool SetFont(const wxFont& font);
+#endif
protected:
virtual wxSize DoGetBestSize() const;
// sets the label to the given string and also sets it for the given widget
void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);
+#if wxUSE_MARKUP
+ void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label);
+#endif // wxUSE_MARKUP
// GtkFrame helpers
GtkWidget* GTKCreateFrame(const wxString& label);
static wxString GTKRemoveMnemonics(const wxString& label);
// converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s
- //
- // for GTK+ 1 (which doesn't support mnemonics) this is the same as
- // GTKRemoveMnemonics()
static wxString GTKConvertMnemonics(const wxString &label);
+ // converts wx label to GTK+ labels preserving Pango markup
+ static wxString GTKConvertMnemonicsWithMarkup(const wxString& label);
+
// These are used by GetDefaultAttributes
static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
bool useBase = false,
- int state = -1);
+ int state = 0);
static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
bool useBase = false,
- int state = -1);
+ int state = 0);
static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
bool useBase = false,
- int state = -1);
+ int state = 0);
static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
bool useBase = false,
- int state = -1);
+ int state = 0);
// Widgets that use the style->base colour for the BG colour should
// override this and return true.
virtual bool UseGTKStyleBase() const { return false; }
- // this field contains the label in wx format, i.e. with "&" mnemonics
- wxString m_label;
+ // Fix sensitivity due to bug in GTK+ < 2.14
+ void GTKFixSensitivity(bool onlyIfUnderMouse = true);
private:
DECLARE_DYNAMIC_CLASS(wxControl)
};
-#endif // __GTKCONTROLH__
+#endif // _WX_GTK_CONTROL_H_