* modules/gui/wxwindows/*: fixes for the win32 build. Removed a few

   unnecessary things and replaced the stop icon with a new one.

diff --git a/modules/gui/wxwindows/bitmaps/stop.xpm b/modules/gui/wxwindows/bitmaps/stop.xpm
index 73dac55039314b2848471bf111adbede1150994c..78f2f82906f60f1ee21f356d376db29ac406663c 100644 (file)
--- a/modules/gui/wxwindows/bitmaps/stop.xpm
+++ b/modules/gui/wxwindows/bitmaps/stop.xpm
@@ -1,62 +1,32 @@
 /* XPM */
 static char * stop_xpm[] = {
-"24 24 37 1",
+"24 24 7 1",
 "      c None",
 ".     c #000000",
-"+     c #160606",
-"@     c #27090A",
-"#     c #310D0D",
-"$     c #633E3F",
-"%     c #703F40",
-"&     c #654040",
-"*     c #754748",
-"=     c #7D5E61",
-"-     c #824E4F",
-";     c #804F50",
-">     c #8C5A5B",
-",     c #905E5F",
-"'     c #9F6869",
-")     c #997171",
-"!     c #A06D6E",
-"~     c #A67577",
-"{     c #B27C7E",
-"]     c #AD8C8D",
-"^     c #A29797",
-"/     c #B8898B",
-"(     c #B89A9B",
-"_     c #B5A5A5",
-":     c #BFB2B3",
-"<     c #C4999A",
-"[     c #C79FA0",
-"}     c #C9A7A9",
-"|     c #C9AFB0",
-"1     c #CCB5B6",
-"2     c #D7B7B9",
-"3     c #DBC7C7",
-"4     c #DED1D1",
-"5     c #E0C7C8",
-"6     c #E6DBDB",
-"7     c #EDE1E1",
-"8     c #F2E8E8",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"        ..+++++         ",
-"      .._1351(=+@       ",
-"     .^48766645{$#      ",
-"     .6886666622)#      ",
-"    .^876+666.13/%+     ",
-"    .|87+++7.++:}~#     ",
-"    +3767+.+.+_3}/@     ",
-"    +16674+.+44|}/@     ",
-"    @|666..+.+1}(!#     ",
-"    +]34+++6++@<{'@     ",
-"    +)}23+55|@/<!*@     ",
-"     +/<12}2}</'*@      ",
-"     +~<[<<<<~~,*@      ",
-"      +@!//{!-$@+       ",
-"        +@@@##@         ",
+"+     c #C6D7C3",
+"@     c #67925C",
+"#     c #608C56",
+"$     c #5B8851",
+"%     c #36582E",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"     ............       ",
+"     .++++++++++.       ",
+"     .++++++++++.       ",
+"     .++++++++++.       ",
+"     .++++++++++.       ",
+"     .++++++++++.       ",
+"     .++++++++++.       ",
+"     .@@@@@@@@@@.       ",
+"     .@@@@@@@@@@.       ",
+"     .@@@@@@@@@@.       ",
+"     .##########.       ",
+"     .$$$$$$$$$$.       ",
+"     .%%%%%%%%%%.       ",
+"     ............       ",
 "                        ",
 "                        ",
 "                        ",

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index dc41c1a93bca29c4d936de476ec83b97fb60f23c..2dd595e2c6c4351a12d9f82842f5fa235ce7eeef 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -2,7 +2,7 @@
  * interface.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.4 2002/11/18 17:31:54 gbazin Exp $
+ * $Id: interface.cpp,v 1.5 2002/11/20 14:24:00 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -36,15 +36,14 @@
 #undef _
 
 #ifdef WIN32                                                 /* mingw32 hack */
-#undef Yield()
-#undef CreateDialog()
+#undef Yield
+#undef CreateDialog
 #endif
 
 #include <wx/wxprec.h>
 #include <wx/wx.h>
 
 #include "wxwindows.h"
-#include "wx/artprov.h"
 
 /* include the toolbar graphics */
 #include "bitmaps/file.xpm"
@@ -59,12 +58,11 @@
 #include "bitmaps/previous.xpm"
 #include "bitmaps/next.xpm"
 #include "bitmaps/playlist.xpm"
+
 /*****************************************************************************
  * Event Table.
  *****************************************************************************/
 
-const int ID_TOOLBAR = 500;
-
 /* IDs for the controls and the menu commands */
 enum
 {
@@ -192,7 +190,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
     wxBitmap *p_bmp_playlist = new wxBitmap( playlist_xpm );
 
     wxToolBar *toolbar = CreateToolBar(
-        wxTB_HORIZONTAL | wxTB_TEXT | wxTB_FLAT | wxTB_DOCKABLE, ID_TOOLBAR );
+        wxTB_HORIZONTAL | wxTB_TEXT | wxTB_FLAT | wxTB_DOCKABLE );
 
     toolbar->AddTool( OpenFile_Event, _("File"), *p_bmp_file, HELP_FILE );
     toolbar->AddTool( OpenFile_Event, _("Disc"), *p_bmp_disc, HELP_DISC );
@@ -215,7 +213,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
     wxBoxSizer *slider_sizer = new wxBoxSizer( wxVERTICAL );
     slider = new wxSlider( this, SliderScroll_Event, 0, 0, 100,
                            wxDefaultPosition, wxSize( 450, 50 ),
-                           wxSL_HORIZONTAL | wxSL_AUTOTICKS | wxSL_TOP );
+                           wxSL_HORIZONTAL | wxSL_TOP );
     slider_sizer->Add( slider, 0, wxGROW | wxALL | wxALIGN_CENTER, 5 );
 
     /* use the sizer for layout */
@@ -229,7 +227,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
      * for menu items and toolbar tools will automatically get displayed
      * here. */
     statusbar = CreateStatusBar(2);
-    int i_status_width[2] = {-1,-2};
+    int i_status_width[2] = {-2,-3};
     statusbar->SetStatusWidths( 2, i_status_width );
 
     SetTitle( COPYRIGHT_MESSAGE );

diff --git a/modules/gui/wxwindows/timer.cpp b/modules/gui/wxwindows/timer.cpp
index 451e4c6bf52d25b50ce9aaff2d3fa077c5e2772a..2abc37e34251d358b56f2ac5899d5e8f5270f92a 100644 (file)
--- a/modules/gui/wxwindows/timer.cpp
+++ b/modules/gui/wxwindows/timer.cpp
@@ -2,7 +2,7 @@
  * timer.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: timer.cpp,v 1.1 2002/11/18 13:02:16 gbazin Exp $
+ * $Id: timer.cpp,v 1.2 2002/11/20 14:24:00 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -36,8 +36,8 @@
 #undef _
 
 #ifdef WIN32                                                 /* mingw32 hack */
-#undef Yield()
-#undef CreateDialog()
+#undef Yield
+#undef CreateDialog
 #endif
 
 #include <wx/wxprec.h>
@@ -216,5 +216,14 @@ void Timer::Notify()
         p_intf->p_sys->b_playing = 0;
     }
 
+    if( p_intf->b_die )
+    {
+        vlc_mutex_unlock( &p_intf->change_lock );
+
+        /* Prepare to die, young Skywalker */
+        p_main_interface->Close(TRUE);
+        return;
+    }
+
     vlc_mutex_unlock( &p_intf->change_lock );
 }

diff --git a/modules/gui/wxwindows/wxwindows.cpp b/modules/gui/wxwindows/wxwindows.cpp
index de939f5b03a6eaa4f247acd8afbc238840adc135..91fdfc1ad5fac8df35624c8531f29ec789a1870c 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.cpp
+++ b/modules/gui/wxwindows/wxwindows.cpp
@@ -2,7 +2,7 @@
  * wxwindows.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: wxwindows.cpp,v 1.1 2002/11/18 13:02:16 gbazin Exp $
+ * $Id: wxwindows.cpp,v 1.2 2002/11/20 14:24:00 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -175,9 +175,6 @@ IMPLEMENT_APP_NO_MAIN(Instance)
  *****************************************************************************/
 bool Instance::OnInit()
 {
-    wxImage::AddHandler(new wxPNGHandler);
-    //wxImage::AddHandler(new wxXPMHandler);
-
     /* Make an instance of your derived frame. Passing NULL (the default value
      * of Frame's constructor is NULL) as the frame doesn't have a frame
      * since it is the first window */