corrected off by 1 error in cMB2WC() call (thanks valgrind)

[wxWidgets.git] / src / gtk / fontpicker.cpp

diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index 5c7f24b383c00cb0fa7e97801c66013a6c4b47b9..6719a53aa9accd626b72bdd00fe4903a79104f2c 100644 (file)
--- a/src/gtk/fontpicker.cpp
+++ b/src/gtk/fontpicker.cpp
@@ -24,9 +24,6 @@
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -63,8 +60,6 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
 {
     if (!gtk_check_version(2,4,0))
     {
 {
     if (!gtk_check_version(2,4,0))
     {

-        m_needParent = true;
-

         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style, validator, name))
         {
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style, validator, name))
         {


@@ -75,7 +70,7 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
         m_widget = gtk_font_button_new();
 
         // set initial font
         m_widget = gtk_font_button_new();
 
         // set initial font

-        m_selectedFont = initial;
+        m_selectedFont = initial.IsOk() ? initial : *wxNORMAL_FONT;

         UpdateFont();
 
         // honour the fontbutton styles
         UpdateFont();
 
         // honour the fontbutton styles


@@ -87,7 +82,7 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
         gtk_font_button_set_use_size(GTK_FONT_BUTTON(m_widget), usefont);
         gtk_font_button_set_use_font(GTK_FONT_BUTTON(m_widget), usefont);
 
         gtk_font_button_set_use_size(GTK_FONT_BUTTON(m_widget), usefont);
         gtk_font_button_set_use_font(GTK_FONT_BUTTON(m_widget), usefont);
 

-        gtk_widget_show( GTK_WIDGET(m_widget) );
+        gtk_widget_show(m_widget);

 
         // GtkFontButton signals
         g_signal_connect(m_widget, "font-set",
 
         // GtkFontButton signals
         g_signal_connect(m_widget, "font-set",


@@ -97,7 +92,7 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
         m_parent->DoAddChild( this );
 
         PostCreation(size);

-        SetBestSize(size);
+        SetInitialSize(size);

     }
     else
         return wxGenericFontButton::Create(parent, id, initial, pos, size,
     }
     else
         return wxGenericFontButton::Create(parent, id, initial, pos, size,