activating DrawRectangle optimization

[wxWidgets.git] / include / wx / gtk / control.h

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index eba1f5f4f5fd38b81a5197e103543038431e5266..a68832acf493a6c203f42a4c21c72818f5f8eb8c 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -12,20 +12,15 @@
 
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkFrame GtkFrame;
 
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkFrame GtkFrame;

+typedef struct _GtkEntry GtkEntry;

 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 

-// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
-extern "C" {
-    typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
-    typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);
-    typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
-}
-

 class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
 class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {

+    typedef wxControlBase base_type;

 public:
     wxControl();
     wxControl(wxWindow *parent, wxWindowID id,
 public:
     wxControl();
     wxControl(wxWindow *parent, wxWindowID id,


@@ -43,8 +38,10 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 

-

     virtual wxVisualAttributes GetDefaultAttributes() const;
     virtual wxVisualAttributes GetDefaultAttributes() const;

+#ifdef __WXGTK3__
+    virtual bool SetFont(const wxFont& font);
+#endif

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;


@@ -76,19 +73,6 @@ protected:
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                                           bool useBase = false,
                                           int state = 0);
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                                           bool useBase = false,
                                           int state = 0);

-    static wxVisualAttributes
-        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
-                                          bool useBase = false,
-                                          int state = 0);
-    static wxVisualAttributes
-        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
-                                          bool useBase = false,
-                                          int state = 0);
-
-    static wxVisualAttributes
-        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
-                                          bool useBase = false,
-                                          int state = 0);

 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.


@@ -97,6 +81,12 @@ protected:
     // Fix sensitivity due to bug in GTK+ < 2.14
     void GTKFixSensitivity(bool onlyIfUnderMouse = true);
 
     // Fix sensitivity due to bug in GTK+ < 2.14
     void GTKFixSensitivity(bool onlyIfUnderMouse = true);
 

+    // Ask GTK+ for preferred size. Use it after setting the font.
+    wxSize GTKGetPreferredSize(GtkWidget* widget) const;
+
+    // Inner margins in a GtkEntry
+    wxPoint GTKGetEntryMargins(GtkEntry* entry) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxControl)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)
 };