Correct compilation breakage of r63832.

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

diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 57cb827ee1fb3f3d7a12b099e87d72461504066c..1c05b55bdc97f6ec936be42df6722d4427090c0b 100644 (file)
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        emulator.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        emulator.cpp

-// Purpose:     Emulator wxWindows sample
+// Purpose:     Emulator wxWidgets sample

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "emulator.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -29,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)

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


@@ -39,6 +35,7 @@
 #include "wx/cmdline.h"
 #include "wx/image.h"
 #include "wx/file.h"
 #include "wx/cmdline.h"
 #include "wx/image.h"
 #include "wx/file.h"

+#include "wx/filename.h"

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


@@ -56,10 +53,10 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)


@@ -68,7 +65,7 @@ BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
     EVT_CLOSE(wxEmulatorFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxEmulatorFrame::OnCloseWindow)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. wxEmulatorApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. wxEmulatorApp and


@@ -77,14 +74,14 @@ IMPLEMENT_APP(wxEmulatorApp)
 
 static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
 {
 
 static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
 {

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

 
 

-    { 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_SWITCH, "h", "help", "displays help on the command line parameters" },
+    { wxCMD_LINE_SWITCH, "v", "version", "print version" },

 
 

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

 
 

-    { wxCMD_LINE_NONE }
+    wxCMD_LINE_DESC_END

 };
 
 
 };
 
 


@@ -108,7 +105,9 @@ wxEmulatorApp::wxEmulatorApp()
 // 'Main program' equivalent: the program execution "starts" here
 bool wxEmulatorApp::OnInit()
 {
 // 'Main program' equivalent: the program execution "starts" here
 bool wxEmulatorApp::OnInit()
 {

-    wxLog::SetTimestamp(NULL);
+#if wxUSE_LOG
+    wxLog::DisableTimestamp();
+#endif // wxUSE_LOG

     wxInitAllImageHandlers();
 
     wxString currentDir = wxGetCwd();
     wxInitAllImageHandlers();
 
     wxString currentDir = wxGetCwd();


@@ -118,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(_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)
+    if ((m_appDir.Right(5).CmpNoCase(wxT("DEBUG")) == 0) ||
+        (m_appDir.Right(11).CmpNoCase(wxT("DEBUGSTABLE")) == 0) ||
+        (m_appDir.Right(7).CmpNoCase(wxT("RELEASE")) == 0) ||
+        (m_appDir.Right(13).CmpNoCase(wxT("RELEASESTABLE")) == 0)

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


@@ -147,7 +146,7 @@ bool wxEmulatorApp::OnInit()
         wxLog::SetActiveTarget(new wxLogStderr);
 #endif
         wxString msg;
         wxLog::SetActiveTarget(new wxLogStderr);
 #endif
         wxString msg;

-        msg.Printf(wxT("wxWindows PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);
+        msg.Printf(wxT("wxWidgets PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);

         wxLogMessage(msg);
         return false;
     }
         wxLogMessage(msg);
         return false;
     }


@@ -177,15 +176,17 @@ bool wxEmulatorApp::OnInit()
     }
 
     // create the main application window
     }
 
     // create the main application window

-    wxEmulatorFrame *frame = new wxEmulatorFrame(_T("wxEmulator"),
+    wxEmulatorFrame *frame = new wxEmulatorFrame(wxT("wxEmulator"),

                                  wxPoint(50, 50), wxSize(450, 340));
 
                                  wxPoint(50, 50), wxSize(450, 340));
 

+#if wxUSE_STATUSBAR

     frame->SetStatusText(m_emulatorInfo.m_emulatorTitle, 0);
 
     wxString sizeStr;
     sizeStr.Printf(wxT("Screen: %dx%d"), (int) m_emulatorInfo.m_emulatorScreenSize.x,
             (int) m_emulatorInfo.m_emulatorScreenSize.y);
     frame->SetStatusText(sizeStr, 1);
     frame->SetStatusText(m_emulatorInfo.m_emulatorTitle, 0);
 
     wxString sizeStr;
     sizeStr.Printf(wxT("Screen: %dx%d"), (int) m_emulatorInfo.m_emulatorScreenSize.x,
             (int) m_emulatorInfo.m_emulatorScreenSize.y);
     frame->SetStatusText(sizeStr, 1);

+#endif // wxUSE_STATUSBAR

 
     m_containerWindow = new wxEmulatorContainer(frame, wxID_ANY);
 
 
     m_containerWindow = new wxEmulatorContainer(frame, wxID_ANY);
 


@@ -273,14 +274,14 @@ wxEmulatorFrame::wxEmulatorFrame(const wxString& title,
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(Emulator_About, _T("&About...\tF1"), _T("Show about dialog"));
+    helpMenu->Append(Emulator_About, wxT("&About...\tF1"), wxT("Show about dialog"));

 
 

-    menuFile->Append(Emulator_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    menuFile->Append(Emulator_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();

-    menuBar->Append(menuFile, _T("&File"));
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(menuFile, wxT("&File"));
+    menuBar->Append(helpMenu, wxT("&Help"));

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);


@@ -304,9 +305,9 @@ void wxEmulatorFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void wxEmulatorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
 void wxEmulatorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;

-    msg.Printf( _T("wxEmulator is an environment for testing embedded X11 apps.\n"));
+    msg.Printf( wxT("wxEmulator is an environment for testing embedded X11 apps.\n"));

 
 

-    wxMessageBox(msg, _T("About wxEmulator"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, wxT("About wxEmulator"), wxOK | wxICON_INFORMATION, this);

 }
 
 void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))


@@ -454,7 +455,7 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
     wxString rootPath = wxPathOnly(absoluteConfigPath);
 
     {
     wxString rootPath = wxPathOnly(absoluteConfigPath);
 
     {

-        wxFileConfig config(wxT("wxEmulator"), wxT("wxWindows"),
+        wxFileConfig config(wxT("wxEmulator"), wxT("wxWidgets"),

             absoluteConfigPath, wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
 
         config.Read(wxT("/General/title"), & m_emulatorTitle);
             absoluteConfigPath, wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
 
         config.Read(wxT("/General/title"), & m_emulatorTitle);


@@ -483,7 +484,7 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
         m_emulatorScreenSize = wxSize(w, h);
     }
 
         m_emulatorScreenSize = wxSize(w, h);
     }
 

-    if (!m_emulatorBackgroundBitmapName.IsEmpty())
+    if (!m_emulatorBackgroundBitmapName.empty())

     {
         wxString absoluteBackgroundBitmapName = rootPath + wxString(wxFILE_SEP_PATH) + m_emulatorBackgroundBitmapName;
         if ( !wxFile::Exists(absoluteBackgroundBitmapName) )
     {
         wxString absoluteBackgroundBitmapName = rootPath + wxString(wxFILE_SEP_PATH) + m_emulatorBackgroundBitmapName;
         if ( !wxFile::Exists(absoluteBackgroundBitmapName) )


@@ -519,20 +520,20 @@ wxBitmapType wxDetermineImageType(const wxString& filename)
 {
     wxString path, name, ext;
 
 {
     wxString path, name, ext;
 

-    wxSplitPath(filename, & path, & name, & ext);
+    wxFileName::SplitPath(filename, & path, & name, & ext);

 
     ext.MakeLower();
 
     ext.MakeLower();

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

         return wxBITMAP_TYPE_JPEG;
         return wxBITMAP_TYPE_JPEG;

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

         return wxBITMAP_TYPE_GIF;
         return wxBITMAP_TYPE_GIF;

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

         return wxBITMAP_TYPE_BMP;
         return wxBITMAP_TYPE_BMP;

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

         return wxBITMAP_TYPE_PNG;
         return wxBITMAP_TYPE_PNG;

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

         return wxBITMAP_TYPE_PCX;
         return wxBITMAP_TYPE_PCX;

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

         return wxBITMAP_TYPE_TIF;
 
     return wxBITMAP_TYPE_INVALID;
         return wxBITMAP_TYPE_TIF;
 
     return wxBITMAP_TYPE_INVALID;


@@ -553,9 +554,9 @@ wxString wxColourToHexString(const wxColour& col)
 // Convert 6-digit hex string to a colour
 wxColour wxHexStringToColour(const wxString& hex)
 {
 // Convert 6-digit hex string to a colour
 wxColour wxHexStringToColour(const wxString& hex)
 {

-    unsigned int r = wxHexToDec(hex.Mid(0, 2));
-    unsigned int g = wxHexToDec(hex.Mid(2, 2));
-    unsigned int b = wxHexToDec(hex.Mid(4, 2));
+    unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
+    unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));
+    unsigned char b = (unsigned char)wxHexToDec(hex.Mid(4, 2));

 
     return wxColour(r, g, b);
 }
 
     return wxColour(r, g, b);
 }


@@ -571,10 +572,10 @@ wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, const wxStrin
     wxString str;
 
     // Try appVariableName
     wxString str;
 
     // Try appVariableName

-    if (!appVariableName.IsEmpty())
+    if (!appVariableName.empty())

     {
         str = wxGetenv(appVariableName);
     {
         str = wxGetenv(appVariableName);

-        if (!str.IsEmpty())
+        if (!str.empty())

             return str;
     }
 
             return str;
     }
 


@@ -598,7 +599,7 @@ wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, const wxStrin
     wxPathList pathList;
     pathList.AddEnvList(wxT("PATH"));
     str = pathList.FindAbsoluteValidPath(argv0);
     wxPathList pathList;
     pathList.AddEnvList(wxT("PATH"));
     str = pathList.FindAbsoluteValidPath(argv0);

-    if (!str.IsEmpty())
+    if (!str.empty())

         return wxPathOnly(str);
 
     // Failed
         return wxPathOnly(str);
 
     // Failed