Warning fixes after recent library changes.

[wxWidgets.git] / contrib / src / mmedia / vidbase.cpp

diff --git a/contrib/src/mmedia/vidbase.cpp b/contrib/src/mmedia/vidbase.cpp
index 1cd5a0632c2aff2501d927ecae438d8b152c6ee9..a62c2a90cbc26c535f85d22b92eaf92e2929c872 100644 (file)
--- a/contrib/src/mmedia/vidbase.cpp
+++ b/contrib/src/mmedia/vidbase.cpp
@@ -11,11 +11,12 @@
 #pragma implementation "vidbase.h"
 #endif
 
 #pragma implementation "vidbase.h"
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifndef WX_PRECOMP
 #include <wx/stream.h>
 #include <wx/wfstream.h>
 
 #ifndef WX_PRECOMP
 #include <wx/stream.h>
 #include <wx/wfstream.h>

+#include <wx/intl.h>

 #endif
 
 #include "wx/mmedia/vidbase.h"
 #endif
 
 #include "wx/mmedia/vidbase.h"


@@ -32,12 +33,12 @@ wxVideoBaseDriver::wxVideoBaseDriver()
   m_video_output = NULL;
 }
 
   m_video_output = NULL;
 }
 

-wxVideoBaseDriver::wxVideoBaseDriver(wxInputStream& str)
+wxVideoBaseDriver::wxVideoBaseDriver(wxInputStream& WXUNUSED(str))

 {
   m_video_output = NULL;
 }
 
 {
   m_video_output = NULL;
 }
 

-wxVideoBaseDriver::wxVideoBaseDriver(const wxString& filename)
+wxVideoBaseDriver::wxVideoBaseDriver(const wxString& WXUNUSED(filename))

 {
   m_video_output = NULL;
 }
 {
   m_video_output = NULL;
 }


@@ -49,7 +50,7 @@ wxVideoBaseDriver::~wxVideoBaseDriver()
 bool wxVideoBaseDriver::AttachOutput(wxWindow& output)
 {
   m_video_output = &output;
 bool wxVideoBaseDriver::AttachOutput(wxWindow& output)
 {
   m_video_output = &output;

-  return TRUE;
+  return true;

 }
 
 void wxVideoBaseDriver::DetachOutput()
 }
 
 void wxVideoBaseDriver::DetachOutput()


@@ -61,11 +62,11 @@ void wxVideoBaseDriver::DetachOutput()
 
 wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv)
 {
 
 wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv)
 {

-  wxFrame *frame = new wxFrame(NULL, -1, "Video Output", wxDefaultPosition, wxSize(100, 100));
-  wxWindow *vid_out = new wxWindow(frame, -1, wxPoint(0, 0), wxSize(300, 300));
+  wxFrame *frame = new wxFrame(NULL, wxID_ANY, _("Video Output"), wxDefaultPosition, wxSize(100, 100));
+  wxWindow *vid_out = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(300, 300));

 
   frame->Layout();
 
   frame->Layout();

-  frame->Show(TRUE);
+  frame->Show(true);

 
   vid_drv->AttachOutput(*vid_out);
   vid_drv->Play();
 
   vid_drv->AttachOutput(*vid_out);
   vid_drv->Play();