Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 085e5e8cfc3624e60741fa04aabc344dd00d1d00..bcac0a83d82bd8827fa714b40cac92f6e2f1112f 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -10,7 +10,7 @@
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -29,7 +29,12 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

-extern const wxChar* wxControlNameStr;
+// 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
 {
 
 class wxControl : public wxControlBase
 {


@@ -54,9 +59,39 @@ 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 wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+    void PostCreation(const wxSize& size);
+
+#ifdef __WXGTK20__
+    wxString PrepareLabelMnemonics( const wxString &label ) const;
+#endif
+
+    // These are used by GetDefaultAttributes
+    static wxVisualAttributes
+        GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
+                                          bool useBase = false,
+                                          int state = -1);
+    static wxVisualAttributes
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
+                                          bool useBase = false,
+                                          int state = -1);
+    static wxVisualAttributes
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
+                                          bool useBase = false,
+                                          int state = -1);
+
+    static wxVisualAttributes
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
+                                          bool useBase = false,
+                                          int state = -1);
+
+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return false; }

 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on