Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 5c7ffcc4dce8bc2b876883cf19ae6457356754e7..454d1fc90d4d270db628153a46b8e2e00bac9e13 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.h
+// Name:        wx/gtk/control.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,20 +11,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 gchar*);
-    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,12 +37,10 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 

-    virtual void SetLabel( const wxString &label );
-    virtual wxString GetLabel() const;
-

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

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

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


@@ -56,6 +48,9 @@ protected:
 
     // sets the label to the given string and also sets it for the given widget
     void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);
 
     // 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);
 
     // GtkFrame helpers
     GtkWidget* GTKCreateFrame(const wxString& label);


@@ -67,36 +62,29 @@ protected:
     static wxString GTKRemoveMnemonics(const wxString& label);
 
     // converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s
     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);
 
     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,
     // 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);
+                                          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; }
 
 
     // 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);
+
+    // 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)