Improvements to preferences

[vlc] / modules / gui / wxwindows / interface.cpp

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 80f4229bf87132c81419f513c9aa6c8926f2ab53..eef3c60a6207089623cc4165f0e262a50dd13074 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -217,7 +217,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
     wxWindow *p_dummy = new wxWindow( this, 0, wxDefaultPosition,
                                       wxSize(0,0) );
     p_dummy->SetFocus();
-    frame_sizer->Add( p_dummy, 0, wxEXPAND );
+    frame_sizer->Add( p_dummy, 0, 0 );
 
     /* Creation of the menu bar */
     CreateOurMenuBar();
@@ -279,6 +279,12 @@ Interface::~Interface()
     delete timer;
 }
 
+void Interface::Init()
+{
+    /* Misc init */
+    SetupHotkeys();
+}
+
 void Interface::Update()
 {
     /* Misc updates */
@@ -366,7 +372,11 @@ void Interface::CreateOurMenuBar()
 #if defined(__WXGTK__)
             22 /* approximate margin */;
 #else
+#if (wxMAJOR_VERSION <= 2) && (wxMINOR_VERSION <= 5) && (wxRELEASE_NUMBER < 3)
             4 /* approximate margin */;
+#else
+            18 /* approximate margin */;
+#endif
 #endif
     }
     frame_sizer->SetMinSize( i_size, -1 );
@@ -609,8 +619,7 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
             wxU(_("&Undock Ext. GUI") ) );
         if( b_undock ) p_settings_menu->Check( Undock_Event, TRUE );
 #endif
-        p_settings_menu->AppendCheckItem( Bookmarks_Event,
-            wxU(_("&Bookmarks...") ) );
+        p_settings_menu->Append( Bookmarks_Event, wxU(_("&Bookmarks...") ) );
         p_settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")) );
     }
 
@@ -663,7 +672,7 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
 void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxString msg;
-    msg.Printf( wxString(wxT("VLC media player " VERSION)) +
+    msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
         wxU(_(" (wxWindows interface)\n\n")) +
         wxU(_("(c) 1996-2004 - the VideoLAN Team\n\n")) +
         wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +