X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1b327e1f98b997a36866f96efe3768302eb4e88..dcb39c53303d1ec6884f7bcd7bc9dc101e560e62:/utils/emulator/src/emulator.h

diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index 5cde3128f4..0ef4a5c37b 100644
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -5,14 +5,14 @@
 // 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "emulator.h"
 #endif
 
@@ -24,7 +24,7 @@ class wxEmulatorInfo: public wxObject
 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);
@@ -96,6 +96,7 @@ public:
     wxEmulatorContainer*    m_containerWindow;
     wxString                m_appDir;
     wxString                m_displayNumber;
+    long                    m_xnestPID;
 };
 
 // The container for the Xnest window. The decorations
@@ -124,12 +125,13 @@ public:
     // 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 OnCloseWindow(wxCloseEvent& event);
 
 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()
 };
 
@@ -150,7 +152,7 @@ enum
 };
 
 // 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);