remove ancient defines left over from GTK1

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

diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index 9a59883d67686caba721743fe8e46fe8f9ef1302..2dcd0c7aa2be2a39fd016feefce820c5b15bd979 100644 (file)
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -4,17 +4,14 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2002-03-10
 // Author:      Julian Smart
 // Modified by:
 // Created:     2002-03-10

-// RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EMULATOR_H_
 #define _WX_EMULATOR_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EMULATOR_H_
 #define _WX_EMULATOR_H_
 

-#ifdef __GNUG__
-    #pragma interface "emulator.h"
-#endif
+#define wxEMULATOR_VERSION 0.1

 
 // Information about the emulator decorations
 class wxEmulatorInfo: public wxObject
 
 // Information about the emulator decorations
 class wxEmulatorInfo: public wxObject


@@ -22,7 +19,7 @@ class wxEmulatorInfo: public wxObject
 public:
 
     wxEmulatorInfo() { Init(); }
 public:
 
     wxEmulatorInfo() { Init(); }

-    wxEmulatorInfo(const wxEmulatorInfo& info) { Init(); Copy(info); }
+    wxEmulatorInfo(const wxEmulatorInfo& info) : wxObject() { Init(); Copy(info); }

 
     void operator= (const wxEmulatorInfo& info) { Copy(info); }
     void Copy(const wxEmulatorInfo& info);
 
     void operator= (const wxEmulatorInfo& info) { Copy(info); }
     void Copy(const wxEmulatorInfo& info);


@@ -31,7 +28,10 @@ public:
     void Init();
 
     // Loads bitmaps
     void Init();
 
     // Loads bitmaps

-    bool Load();
+    bool Load(const wxString& appDir);
+
+    // Emulator config filename
+    wxString m_emulatorFilename;

 
     // Emulator title
     wxString m_emulatorTitle;
 
     // Emulator title
     wxString m_emulatorTitle;


@@ -47,6 +47,10 @@ public:
     // The emulated screen size, e.g. 320x240
     wxSize m_emulatorScreenSize;
 
     // The emulated screen size, e.g. 320x240
     wxSize m_emulatorScreenSize;
 

+    // The emulated device size. This is ignored
+    // if there is a background bitmap
+    wxSize m_emulatorDeviceSize;
+

     // The bitmap used for drawing the main emulator
     // decorations
     wxBitmap m_emulatorBackgroundBitmap;
     // The bitmap used for drawing the main emulator
     // decorations
     wxBitmap m_emulatorBackgroundBitmap;


@@ -68,9 +72,16 @@ public:
     virtual bool OnInit();
 
     // Load the specified emulator
     virtual bool OnInit();
 
     // Load the specified emulator

-    bool LoadEmulator();
+    bool LoadEmulator(const wxString& appDir);
+
+    // Get app dir
+    wxString GetAppDir() const { return m_appDir; }
+
+    // Prepend the current app program directory to the name
+    wxString GetFullAppPath(const wxString& filename) const;

 
 public:
 
 public:

+

     wxEmulatorInfo          m_emulatorInfo;
 #ifdef __WXX11__
     wxAdoptedWindow*        m_xnestWindow;
     wxEmulatorInfo          m_emulatorInfo;
 #ifdef __WXX11__
     wxAdoptedWindow*        m_xnestWindow;


@@ -78,6 +89,9 @@ public:
     wxWindow*               m_xnestWindow;
 #endif
     wxEmulatorContainer*    m_containerWindow;
     wxWindow*               m_xnestWindow;
 #endif
     wxEmulatorContainer*    m_containerWindow;

+    wxString                m_appDir;
+    wxString                m_displayNumber;
+    long                    m_xnestPID;

 };
 
 // The container for the Xnest window. The decorations
 };
 
 // The container for the Xnest window. The decorations


@@ -106,12 +120,13 @@ public:
     // ctor(s)
     wxEmulatorFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
 
     // ctor(s)
     wxEmulatorFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
 

-    // event handlers (these functions should _not_ be virtual)
+    // event handlers

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnCloseWindow(wxCloseEvent& event);

 
 private:
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -132,7 +147,16 @@ enum
 };
 
 // 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);
+
+// Convert a colour to a 6-digit hex string
+wxString wxColourToHexString(const wxColour& col);
+
+// Convert 6-digit hex string to a colour
+wxColour wxHexStringToColour(const wxString& hex);
+
+// Find the absolute path where this application has been run from.
+wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, const wxString& appVariableName);

 
 #endif
     // _WX_EMULATOR_H_
 
 #endif
     // _WX_EMULATOR_H_