Minor corrections to make dist after reports

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 0bbe956798d41409cd5da81dfca6bf29d02697c2..cac29c261bfa133ca46e4ddd1e9de0d434cdeb3d 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -7,23 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKCONTROLH__
-#define __GTKCONTROLH__
+#ifndef _WX_GTK_CONTROL_H_
+#define _WX_GTK_CONTROL_H_

 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/window.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControl;
+typedef struct _GtkLabel GtkLabel;
+typedef struct _GtkFrame GtkFrame;

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


@@ -55,20 +43,33 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 

-    // this function will filter out '&' characters and will put the accelerator
-    // 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;
 
     virtual wxVisualAttributes GetDefaultAttributes() const;
 

+    virtual void OnInternalIdle();
+

 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
 

-#ifdef __WXGTK20__
-    wxString PrepareLabelMnemonics( const wxString &label ) const;
-#endif
+    // 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);
+    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
+    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
 
     // These are used by GetDefaultAttributes
     static wxVisualAttributes


@@ -93,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; }
 

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

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

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