provide overloads for all kinds of strings for wxDataFormat ctor to allow passing...

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 42e48726bfd212cdc2ba7a3fc3811c036fd78b4d..cac29c261bfa133ca46e4ddd1e9de0d434cdeb3d 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -7,19 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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;
 
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkFrame GtkFrame;


@@ -54,30 +43,34 @@ 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();
+

 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
 
     // sets the label to the given string and also sets it for the given widget
     void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);
 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
 
     // sets the label to the given string and also sets it for the given widget
     void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);

+    void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label);

 
 

-    // as GTKSetLabelForLabel() but for a GtkFrame widget
+    // GtkFrame helpers
+    GtkWidget* GTKCreateFrame(const wxString& label);

     void GTKSetLabelForFrame(GtkFrame *w, const wxString& label);
     void GTKSetLabelForFrame(GtkFrame *w, const wxString& label);

+    void GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* rc);
+    void GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget);

 
     // remove mnemonics ("&"s) from the label
     static wxString GTKRemoveMnemonics(const wxString& label);
 
     // converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s
 
     // remove mnemonics ("&"s) from the 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);
 
     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,
     // These are used by GetDefaultAttributes
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,


@@ -101,11 +94,8 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return false; }
 
     // 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;
-

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

-#endif // __GTKCONTROLH__
+#endif // _WX_GTK_CONTROL_H_