projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
define wxUSE_CRASHREPORT as 0 for non-MSW
[wxWidgets.git]
/
include
/
wx
/
gtk
/
control.h
diff --git
a/include/wx/gtk/control.h
b/include/wx/gtk/control.h
index 553f94f7c1d0205c37d74ff37e7debbee6a8786c..bcac0a83d82bd8827fa714b40cac92f6e2f1112f 100644
(file)
--- a/
include/wx/gtk/control.h
+++ b/
include/wx/gtk/control.h
@@
-29,6
+29,13
@@
class wxControl;
// wxControl
//-----------------------------------------------------------------------------
// wxControl
//-----------------------------------------------------------------------------
+// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
+extern "C" {
+ typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
+ typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
+ typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
+}
+
class wxControl : public wxControlBase
{
public:
class wxControl : public wxControlBase
{
public:
@@
-52,15
+59,10
@@
public:
// char (the one immediately after '&') into m_chAccel (TODO not yet)
virtual void SetLabel( const wxString &label );
virtual wxString GetLabel() const;
// char (the one immediately after '&') into m_chAccel (TODO not yet)
virtual void SetLabel( const wxString &label );
virtual wxString GetLabel() const;
-
+
virtual wxVisualAttributes GetDefaultAttributes() const;
protected:
virtual wxVisualAttributes GetDefaultAttributes() const;
protected:
- virtual void ApplyWidgetStyle(bool forceStyle = false);
- // helper function to ease native widgets wrapping, called by
- // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
- virtual void DoApplyWidgetStyle(GtkRcStyle *style);
-
virtual wxSize DoGetBestSize() const;
void PostCreation(const wxSize& size);
virtual wxSize DoGetBestSize() const;
void PostCreation(const wxSize& size);
@@
-74,16
+76,16
@@
protected:
bool useBase = false,
int state = -1);
static wxVisualAttributes
bool useBase = false,
int state = -1);
static wxVisualAttributes
- GetDefaultAttributesFromGTKWidget(
GtkWidget* (*widget_new)(void)
,
+ GetDefaultAttributesFromGTKWidget(
wxGtkWidgetNew_t
,
bool useBase = false,
int state = -1);
static wxVisualAttributes
bool useBase = false,
int state = -1);
static wxVisualAttributes
- GetDefaultAttributesFromGTKWidget(
GtkWidget* (*widget_new)(const gchar*)
,
+ GetDefaultAttributesFromGTKWidget(
wxGtkWidgetNewFromStr_t
,
bool useBase = false,
int state = -1);
static wxVisualAttributes
bool useBase = false,
int state = -1);
static wxVisualAttributes
- GetDefaultAttributesFromGTKWidget(
GtkWidget* (*widget_new)(GtkAdjustment*)
,
+ GetDefaultAttributesFromGTKWidget(
wxGtkWidgetNewFromAdj_t
,
bool useBase = false,
int state = -1);
bool useBase = false,
int state = -1);