Use sizers for layout

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

diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index ee02672792a267d6b5cebea6f1420290f01f266d..f14f968ff34a3387f561b7070beb8aac2e01554e 100644 (file)
--- 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
 
@@ -131,7 +131,7 @@ public:
     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()
 };
 
@@ -152,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);