Allow wxSoundStreamESD to be compiled even when no esd.h is

[wxWidgets.git] / utils / emulator / src / emulator.cpp

diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index ecfd4b2903f226acacfcb14d9167860accb71d72..f7eb9459aad594d578cede8b1b325d8e7d3e5d8d 100644 (file)
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -37,6 +37,7 @@
 #include "wx/confbase.h"
 #include "wx/fileconf.h"
 #include "wx/cmdline.h"
 #include "wx/confbase.h"
 #include "wx/fileconf.h"
 #include "wx/cmdline.h"

+#include "wx/image.h"

 
 #ifdef __WXX11__    
 #include "wx/x11/reparent.h"
 
 #ifdef __WXX11__    
 #include "wx/x11/reparent.h"


@@ -75,12 +76,12 @@ IMPLEMENT_APP(wxEmulatorApp)
 
 static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
 {
 
 static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
 {

-    { wxCMD_LINE_OPTION, "u", "use-display",   "display number to use (default 100)" },
+    { wxCMD_LINE_OPTION, _T("u"), _T("use-display"),   _T("display number to use (default 100)") },

 
 

-    { wxCMD_LINE_SWITCH, "h", "help",   "displays help on the command line parameters" },
-    { wxCMD_LINE_SWITCH, "v", "version",    "print version" },
+    { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("displays help on the command line parameters") },
+    { wxCMD_LINE_SWITCH, _T("v"), _T("version"),    _T("print version") },

 
 

-    { wxCMD_LINE_PARAM,  NULL, NULL, "config file 1", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+    { wxCMD_LINE_PARAM,  NULL, NULL, _T("config file 1"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },

 
     { wxCMD_LINE_NONE }
 };
 
     { wxCMD_LINE_NONE }
 };


@@ -116,10 +117,10 @@ bool wxEmulatorApp::OnInit()
     
     // If the development version, go up a directory.
 #ifdef __WXMSW__
     
     // If the development version, go up a directory.
 #ifdef __WXMSW__

-    if ((m_appDir.Right(5).CmpNoCase("DEBUG") == 0) ||
-        (m_appDir.Right(11).CmpNoCase("DEBUGSTABLE") == 0) ||
-        (m_appDir.Right(7).CmpNoCase("RELEASE") == 0) ||
-        (m_appDir.Right(13).CmpNoCase("RELEASESTABLE") == 0)
+    if ((m_appDir.Right(5).CmpNoCase(_T("DEBUG")) == 0) ||
+        (m_appDir.Right(11).CmpNoCase(_T("DEBUGSTABLE")) == 0) ||
+        (m_appDir.Right(7).CmpNoCase(_T("RELEASE")) == 0) ||
+        (m_appDir.Right(13).CmpNoCase(_T("RELEASESTABLE")) == 0)

         )
         m_appDir = wxPathOnly(m_appDir);
 #endif
         )
         m_appDir = wxPathOnly(m_appDir);
 #endif


@@ -306,7 +307,7 @@ void wxEmulatorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(msg, _T("About wxEmulator"), wxOK | wxICON_INFORMATION, this);
 }
 
     wxMessageBox(msg, _T("About wxEmulator"), wxOK | wxICON_INFORMATION, this);
 }
 

-void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& event)
+void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 #ifdef __WXX11__
     if (wxGetApp().m_xnestWindow)
 {
 #ifdef __WXX11__
     if (wxGetApp().m_xnestWindow)


@@ -335,7 +336,7 @@ wxEmulatorContainer::wxEmulatorContainer(wxWindow* parent, wxWindowID id):
 {
 }
 
 {
 }
 

-void wxEmulatorContainer::OnSize(wxSizeEvent& event)
+void wxEmulatorContainer::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     DoResize();
 }
 {
     DoResize();
 }


@@ -363,7 +364,7 @@ void wxEmulatorContainer::DoResize()
     Refresh();
 }
 
     Refresh();
 }
 

-void wxEmulatorContainer::OnPaint(wxPaintEvent& event)
+void wxEmulatorContainer::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxPaintDC dc(this);
     
 {
     wxPaintDC dc(this);
     


@@ -487,8 +488,8 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
             return FALSE;
         }
         
             return FALSE;
         }
         

-        int type = wxDetermineImageType(m_emulatorBackgroundBitmapName);
-        if (type == -1)
+        wxBitmapType type = wxDetermineImageType(m_emulatorBackgroundBitmapName);
+        if (type == wxBITMAP_TYPE_INVALID)

             return FALSE;
         
         if (!m_emulatorBackgroundBitmap.LoadFile(m_emulatorBackgroundBitmapName, type))
             return FALSE;
         
         if (!m_emulatorBackgroundBitmap.LoadFile(m_emulatorBackgroundBitmapName, type))


@@ -505,27 +506,27 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
 }
 
 // Returns the image type, or -1, determined from the extension.
 }
 
 // Returns the image type, or -1, determined from the extension.

-int wxDetermineImageType(const wxString& filename)
+wxBitmapType wxDetermineImageType(const wxString& filename)

 {
     wxString path, name, ext;
 
     wxSplitPath(filename, & path, & name, & ext);
 
     ext.MakeLower();
 {
     wxString path, name, ext;
 
     wxSplitPath(filename, & path, & name, & ext);
 
     ext.MakeLower();

-    if (ext == "jpg" || ext == "jpeg")
+    if (ext == _T("jpg") || ext == _T("jpeg"))

         return wxBITMAP_TYPE_JPEG;
         return wxBITMAP_TYPE_JPEG;

-    else if (ext == "gif")
+    if (ext == _T("gif"))

         return wxBITMAP_TYPE_GIF;
         return wxBITMAP_TYPE_GIF;

-    else if (ext == "bmp")
+    if (ext == _T("bmp"))

         return wxBITMAP_TYPE_BMP;
         return wxBITMAP_TYPE_BMP;

-    else if (ext == "png")
+    if (ext == _T("png"))

         return wxBITMAP_TYPE_PNG;
         return wxBITMAP_TYPE_PNG;

-    else if (ext == "pcx")
+    if (ext == _T("pcx"))

         return wxBITMAP_TYPE_PCX;
         return wxBITMAP_TYPE_PCX;

-    else if (ext == "tif" || ext == "tiff")
+    if (ext == _T("tif") || ext == _T("tiff"))

         return wxBITMAP_TYPE_TIF;
         return wxBITMAP_TYPE_TIF;

-    else
-        return -1;
+    
+    return wxBITMAP_TYPE_INVALID;

 }
 
 // Convert a colour to a 6-digit hex string
 }
 
 // Convert a colour to a 6-digit hex string


@@ -577,7 +578,7 @@ wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, const wxStrin
     {
         // Is it a relative path?
         wxString currentDir(cwd);
     {
         // Is it a relative path?
         wxString currentDir(cwd);

-        if (currentDir.Last() != wxFILE_SEP_PATH)
+        if (!wxEndsWithPathSeparator(currentDir))

             currentDir += wxFILE_SEP_PATH;
 
         str = currentDir + argv0;
             currentDir += wxFILE_SEP_PATH;
 
         str = currentDir + argv0;