Update <make win-dist>

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

diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index c79d27d3bcf03d55e12532ded55028c4b0ac9380..dace1751e773a88f90abb84daad02da6e18936b6 100644 (file)
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -16,7 +16,7 @@
 
 #include "wx/filectrl.h"
 
 
 #include "wx/filectrl.h"
 

-#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#if wxUSE_FILECTRL && !defined(__WXUNIVERSAL__)

 
 #ifndef WX_PRECOMP
 #    include "wx/sizer.h"
 
 #ifndef WX_PRECOMP
 #    include "wx/sizer.h"


@@ -258,7 +258,6 @@ IMPLEMENT_DYNAMIC_CLASS( wxGtkFileCtrl, wxControl )
 
 void wxGtkFileCtrl::Init()
 {
 
 void wxGtkFileCtrl::Init()
 {

-    m_hasFocus = false;

     m_checkNextSelEvent = false;
 
     // ignore the first folder change event which is fired upon startup.
     m_checkNextSelEvent = false;
 
     // ignore the first folder change event which is fired upon startup.


@@ -288,6 +287,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
         gtkAction = GTK_FILE_CHOOSER_ACTION_SAVE;
 
     m_widget =  gtk_alignment_new ( 0, 0, 1, 1 );
         gtkAction = GTK_FILE_CHOOSER_ACTION_SAVE;
 
     m_widget =  gtk_alignment_new ( 0, 0, 1, 1 );

+    g_object_ref(m_widget);

     m_fcWidget = GTK_FILE_CHOOSER( gtk_file_chooser_widget_new(gtkAction) );
     gtk_widget_show ( GTK_WIDGET( m_fcWidget ) );
     gtk_container_add ( GTK_CONTAINER ( m_widget ), GTK_WIDGET( m_fcWidget ) );
     m_fcWidget = GTK_FILE_CHOOSER( gtk_file_chooser_widget_new(gtkAction) );
     gtk_widget_show ( GTK_WIDGET( m_fcWidget ) );
     gtk_container_add ( GTK_CONTAINER ( m_widget ), GTK_WIDGET( m_fcWidget ) );


@@ -421,8 +421,6 @@ void wxGtkFileCtrl::ShowHidden(bool show)
     g_object_set (G_OBJECT (m_fcWidget), "show-hidden", show, NULL);
 }
 
     g_object_set (G_OBJECT (m_fcWidget), "show-hidden", show, NULL);
 }
 

-#endif 
-    // wxUSE_FILECTRL
+#endif // wxUSE_FILECTRL

 
 

-#endif
-    // if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_FILECTRL && !defined(__WXUNIVERSAL__)