removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related...

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 5c7ffcc4dce8bc2b876883cf19ae6457356754e7..cac29c261bfa133ca46e4ddd1e9de0d434cdeb3d 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -43,8 +43,6 @@ 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;
 


@@ -56,6 +54,7 @@ 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);

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

 
     // GtkFrame helpers
     GtkWidget* GTKCreateFrame(const wxString& label);
 
     // GtkFrame helpers
     GtkWidget* GTKCreateFrame(const wxString& label);


@@ -67,11 +66,11 @@ 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,
     // These are used by GetDefaultAttributes
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,


@@ -95,9 +94,6 @@ 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)
 };