Unicode fixes

[wxWidgets.git] / src / gtk1 / button.cpp

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index cd85a483aec4614ef04b00a9002c058026f79376..47662e31de11a6e52ce4c0133bc41b99b6706d8b 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -13,8 +13,8 @@
 
 #include "wx/button.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // classes
@@ -77,19 +77,40 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );
-       return FALSE;
+           return FALSE;
     }
 
-
-    m_widget = gtk_button_new_with_label( "" );
+/*
+    wxString label2( label );
+    for (size_t i = 0; i < label2.Len(); i++)
+    {
+        if (label2.GetChar(i) == wxT('&'))
+           label2.SetChar(i,wxT('_'));
+    }
+    
+    GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
+    gtk_widget_show( accel_label );
+    
+    m_widget = gtk_button_new();
+    gtk_container_add( GTK_CONTAINER(m_widget), accel_label );
+    
+    gtk_accel_label_set_accel_widget( GTK_ACCEL_LABEL(accel_label), m_widget );
     
+    guint accel_key = gtk_label_parse_uline (GTK_LABEL(accel_label), label2.mb_str() );
+    gtk_accel_label_refetch( GTK_ACCEL_LABEL(accel_label) );
+    
+    wxControl::SetLabel( label );
+*/
+    
+    m_widget = gtk_button_new_with_label("");
+
+    SetLabel( label );
+
 #if (GTK_MINOR_VERSION > 0)    
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 #endif
 
-    SetLabel(label);
-
     int x = 0;  int y = 0;
     wxFont new_font( parent->GetFont() );
     GetTextExtent( m_label, &x, &y, (int*)NULL, (int*)NULL, &new_font );
@@ -103,7 +124,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     if (newSize.y == -1)
     {
         newSize.y = 11+y;
-       if (newSize.x < 26) newSize.x = 26;
+       if (newSize.y < 26) newSize.y = 26;
     }
        
     SetSize( newSize.x, newSize.y );