// declarations
// ============================================================================
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "emulator.h"
#endif
#include "wx/confbase.h"
#include "wx/fileconf.h"
#include "wx/cmdline.h"
+#include "wx/image.h"
+#include "wx/file.h"
-#ifdef __WXX11__
+#ifdef __WXX11__
#include "wx/x11/reparent.h"
#endif
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 }
};
// Use argv to get current app directory
m_appDir = wxFindAppPath(argv[0], currentDir, wxT("WXEMUDIR"));
-
+
// 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
wxLog::SetActiveTarget(new wxLogStderr);
#endif
parser.Usage();
- return FALSE;
+ return false;
}
if (parser.Found(wxT("v")))
{
wxString msg;
msg.Printf(wxT("wxWindows PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);
wxLogMessage(msg);
- return FALSE;
+ return false;
}
if (parser.Found(wxT("u"), & m_displayNumber))
{
if (!LoadEmulator(m_appDir))
{
//wxMessageBox(wxT("Sorry, could not load this emulator. Please check bitmaps are valid."));
- return FALSE;
+ return false;
}
-
+
// create the main application window
wxEmulatorFrame *frame = new wxEmulatorFrame(_T("wxEmulator"),
wxPoint(50, 50), wxSize(450, 340));
-
+
frame->SetStatusText(m_emulatorInfo.m_emulatorTitle, 0);
wxString sizeStr;
(int) m_emulatorInfo.m_emulatorScreenSize.y);
frame->SetStatusText(sizeStr, 1);
- m_containerWindow = new wxEmulatorContainer(frame, -1);
+ m_containerWindow = new wxEmulatorContainer(frame, wxID_ANY);
frame->SetClientSize(m_emulatorInfo.m_emulatorDeviceSize.x,
m_emulatorInfo.m_emulatorDeviceSize.y);
-
+
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
- frame->Show(TRUE);
-
-#ifdef __WXX11__
+ frame->Show(true);
+
+#ifdef __WXX11__
m_xnestWindow = new wxAdoptedWindow;
wxString cmd;
{
frame->Destroy();
wxMessageBox(wxT("Sorry, could not run Xnest. Please check your PATH."));
- return FALSE;
+ return false;
}
-
+
wxReparenter reparenter;
if (!reparenter.WaitAndReparent(m_containerWindow, m_xnestWindow, wxT("Xnest")))
{
wxMessageBox(wxT("Sorry, could not reparent Xnest.."));
frame->Destroy();
- return FALSE;
+ return false;
}
#endif
m_containerWindow->DoResize();
// success: wxApp::OnRun() will be called which will enter the main message
- // loop and the application will run. If we returned FALSE here, the
+ // loop and the application will run. If we returned false here, the
// application would exit immediately.
- return TRUE;
+ return true;
}
// Prepend the current program directory to the name
path += '\\';
#endif
path += filename;
-
+
return path;
}
// ----------------------------------------------------------------------------
// frame constructor
-wxEmulatorFrame::wxEmulatorFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
- : wxFrame(NULL, -1, title, pos, size)
+wxEmulatorFrame::wxEmulatorFrame(const wxString& title,
+ const wxPoint& pos, const wxSize& size)
+ : wxFrame(NULL, wxID_ANY, title, pos, size)
{
// set the frame icon
SetIcon(wxICON(emulator));
void wxEmulatorFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- // TRUE is to force the frame to close
- Close(TRUE);
+ // true is to force the frame to close
+ Close(true);
}
void wxEmulatorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
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)
{
}
-void wxEmulatorContainer::OnSize(wxSizeEvent& event)
+void wxEmulatorContainer::OnSize(wxSizeEvent& WXUNUSED(event))
{
DoResize();
}
{
int deviceWidth = wxGetApp().m_emulatorInfo.m_emulatorDeviceSize.x;
int deviceHeight = wxGetApp().m_emulatorInfo.m_emulatorDeviceSize.y;
-
+
int x = wxMax(0, (int) ((sz.x - deviceWidth)/2.0));
int y = wxMax(0, (int) ((sz.y - deviceHeight)/2.0));
-
+
x += wxGetApp().m_emulatorInfo.m_emulatorScreenPosition.x;
y += wxGetApp().m_emulatorInfo.m_emulatorScreenPosition.y;
-
+
wxGetApp().m_xnestWindow->Move(x, y);
}
Refresh();
}
-void wxEmulatorContainer::OnPaint(wxPaintEvent& event)
+void wxEmulatorContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
-
+
wxSize sz = GetClientSize();
if (wxGetApp().m_emulatorInfo.m_emulatorBackgroundBitmap.Ok())
{
int deviceWidth = wxGetApp().m_emulatorInfo.m_emulatorDeviceSize.x;
int deviceHeight = wxGetApp().m_emulatorInfo.m_emulatorDeviceSize.y;
-
+
int x = wxMax(0, (int) ((sz.x - deviceWidth)/2.0));
int y = wxMax(0, (int) ((sz.y - deviceHeight)/2.0));
-
+
dc.DrawBitmap(wxGetApp().m_emulatorInfo.m_emulatorBackgroundBitmap, x, y);
}
}
void wxEmulatorContainer::OnEraseBackground(wxEraseEvent& event)
{
- wxDC* dc = NULL;
-
+ wxDC* dc wxDUMMY_INITIALIZE(NULL);
+
if (event.GetDC())
{
dc = event.GetDC();
{
dc = new wxClientDC(this);
}
-
+
dc->SetBackground(wxBrush(wxGetApp().m_emulatorInfo.m_emulatorBackgroundColour, wxSOLID));
dc->Clear();
-
+
if (!event.GetDC())
delete dc;
}
{
// Try to find absolute path
wxString absoluteConfigPath = m_emulatorFilename;
- if (!wxIsAbsolutePath(absoluteConfigPath))
+ if ( !::wxIsAbsolutePath(absoluteConfigPath) )
{
wxString currDir = wxGetCwd();
absoluteConfigPath = currDir + wxString(wxFILE_SEP_PATH) + m_emulatorFilename;
- if (!wxFileExists(absoluteConfigPath))
+ if ( !wxFile::Exists(absoluteConfigPath) )
{
- absoluteConfigPath = appDir + wxString(wxFILE_SEP_PATH) + m_emulatorFilename;
+ absoluteConfigPath = appDir + wxString(wxFILE_SEP_PATH)
+ + m_emulatorFilename;
}
}
- if (!wxFileExists(absoluteConfigPath))
+
+ if ( !wxFile::Exists(absoluteConfigPath) )
{
wxString str;
- str.Printf(wxT("Could not find config file %s"), absoluteConfigPath.c_str()),
+ str.Printf( wxT("Could not find config file %s"),
+ absoluteConfigPath.c_str() );
+
wxMessageBox(str);
- return FALSE;
+ return false;
}
wxString rootPath = wxPathOnly(absoluteConfigPath);
m_emulatorScreenPosition = wxPoint(x, y);
m_emulatorScreenSize = wxSize(w, h);
}
-
+
if (!m_emulatorBackgroundBitmapName.IsEmpty())
{
wxString absoluteBackgroundBitmapName = rootPath + wxString(wxFILE_SEP_PATH) + m_emulatorBackgroundBitmapName;
- if (!wxFileExists(absoluteBackgroundBitmapName))
+ if ( !wxFile::Exists(absoluteBackgroundBitmapName) )
{
wxString str;
- str.Printf(wxT("Could not find bitmap %s"), absoluteBackgroundBitmapName.c_str()),
+ str.Printf( wxT("Could not find bitmap %s"),
+ absoluteBackgroundBitmapName.c_str() );
wxMessageBox(str);
- return FALSE;
+ return false;
}
-
- int type = wxDetermineImageType(m_emulatorBackgroundBitmapName);
- if (type == -1)
- return FALSE;
-
+
+ wxBitmapType type = wxDetermineImageType(m_emulatorBackgroundBitmapName);
+ if (type == wxBITMAP_TYPE_INVALID)
+ return false;
+
if (!m_emulatorBackgroundBitmap.LoadFile(m_emulatorBackgroundBitmapName, type))
{
wxString str;
- str.Printf(wxT("Could not load bitmap file %s"), m_emulatorBackgroundBitmapName.c_str()),
+ str.Printf( wxT("Could not load bitmap file %s"),
+ m_emulatorBackgroundBitmapName.c_str() );
wxMessageBox(str);
- return FALSE;
+ return false;
}
+
m_emulatorDeviceSize = wxSize(m_emulatorBackgroundBitmap.GetWidth(),
m_emulatorBackgroundBitmap.GetHeight());
}
- return TRUE;
+ return true;
}
// 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();
- if (ext == "jpg" || ext == "jpeg")
+ if (ext == _T("jpg") || ext == _T("jpeg"))
return wxBITMAP_TYPE_JPEG;
- else if (ext == "gif")
+ if (ext == _T("gif"))
return wxBITMAP_TYPE_GIF;
- else if (ext == "bmp")
+ if (ext == _T("bmp"))
return wxBITMAP_TYPE_BMP;
- else if (ext == "png")
+ if (ext == _T("png"))
return wxBITMAP_TYPE_PNG;
- else if (ext == "pcx")
+ if (ext == _T("pcx"))
return wxBITMAP_TYPE_PCX;
- else if (ext == "tif" || ext == "tiff")
+ if (ext == _T("tif") || ext == _T("tiff"))
return wxBITMAP_TYPE_TIF;
- else
- return -1;
+
+ return wxBITMAP_TYPE_INVALID;
}
// Convert a colour to a 6-digit hex string
// Convert 6-digit hex string to a colour
wxColour wxHexStringToColour(const wxString& hex)
{
- unsigned int r = 0;
- unsigned int g = 0;
- unsigned int b = 0;
- r = wxHexToDec(hex.Mid(0, 2));
- g = wxHexToDec(hex.Mid(2, 2));
- b = wxHexToDec(hex.Mid(4, 2));
+ unsigned int r = wxHexToDec(hex.Mid(0, 2));
+ unsigned int g = wxHexToDec(hex.Mid(2, 2));
+ unsigned int b = wxHexToDec(hex.Mid(4, 2));
return wxColour(r, g, b);
}
{
// Is it a relative path?
wxString currentDir(cwd);
- if (currentDir.Last() != wxFILE_SEP_PATH)
+ if (!wxEndsWithPathSeparator(currentDir))
currentDir += wxFILE_SEP_PATH;
str = currentDir + argv0;
- if (wxFileExists(str))
+ if ( wxFile::Exists(str) )
return wxPathOnly(str);
}
projects / wxWidgets.git / blobdiff