changed wxPlatform implicit conversion to string to return const reference to wxStrin...

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

diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index f14f968ff34a3387f561b7070beb8aac2e01554e..5fdf0f98be09b10ad6c16b3fbce7321b7edccd80 100644 (file)
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -12,10 +12,6 @@
 #ifndef _WX_EMULATOR_H_
 #define _WX_EMULATOR_H_
 
 #ifndef _WX_EMULATOR_H_
 #define _WX_EMULATOR_H_
 

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

 #define wxEMULATOR_VERSION 0.1
 
 // Information about the emulator decorations
 #define wxEMULATOR_VERSION 0.1
 
 // Information about the emulator decorations


@@ -24,7 +20,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);