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 ee02672792a267d6b5cebea6f1420290f01f266d..2dcd0c7aa2be2a39fd016feefce820c5b15bd979 100644 (file)
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -4,18 +4,13 @@
 // 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
 #define wxEMULATOR_VERSION 0.1
 
 // Information about the emulator decorations


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


@@ -131,7 +126,7 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 private:
     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()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -152,7 +147,7 @@ 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 a colour to a 6-digit hex string
 wxString wxColourToHexString(const wxColour& col);