Add wxX11EventLoopSourcesManager stub implementation to fix wxX11 linking.

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

diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index 5cde3128f4fec3a76b1ba679ecf10037604d0ec8..5fdf0f98be09b10ad6c16b3fbce7321b7edccd80 100644 (file)
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     2002-03-10
 // RCS-ID:      $Id$
 // 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 +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);


@@ -96,6 +92,7 @@ public:
     wxEmulatorContainer*    m_containerWindow;
     wxString                m_appDir;
     wxString                m_displayNumber;
     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


@@ -124,12 +121,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()
 };
 


@@ -150,7 +148,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);