removed stray return from SetFont()

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

diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index 8934897134e20edc3dca34caece95fec88c62e7d..bc24c2e8d8f337098d48dff73b683aa4e408009e 100644 (file)
--- a/src/gtk/fontpicker.cpp
+++ b/src/gtk/fontpicker.cpp
@@ -17,23 +17,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/gtk/private.h"
+#if wxUSE_FONTPICKERCTRL && defined(__WXGTK24__)
+

 #include "wx/fontpicker.h"
 
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 
 #include "wx/fontpicker.h"
 
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 

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

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

-#if wxUSE_FONTPICKERCTRL && defined(__WXGTK24__)
-

 //-----------------------------------------------------------------------------
 // "font-set"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "font-set"
 //-----------------------------------------------------------------------------


@@ -67,6 +61,7 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
     if (!gtk_check_version(2,4,0))
     {
         m_needParent = true;
     if (!gtk_check_version(2,4,0))
     {
         m_needParent = true;

+        m_acceptsFocus = 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))


@@ -78,7 +73,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


@@ -100,7 +95,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,


@@ -126,4 +121,4 @@ void wxFontButton::UpdateFont()
         wxGenericFontButton::UpdateFont();
 }
 
         wxGenericFontButton::UpdateFont();
 }
 

-#endif      // wxUSE_FONTPICKERCTRL
+#endif      // wxUSE_FONTPICKERCTRL && defined(__WXGTK24__)