Fix wxGTK compilation in wxUSE_MENUS==0 case.

[wxWidgets.git] / include / wx / unix / apptrait.h

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index c09cfc48def6b5011f1ea6a1c19ce0268e705f3e..f5e5aebbf0385f1d566e6f4bdc08c8a2111a1ed3 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -35,13 +35,14 @@ public:
 //
 // TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
 //       no advantage in doing this compared to the generic way currently used
 //
 // TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
 //       no advantage in doing this compared to the generic way currently used

-//       by wxX11, should we continue to use GTK/Motif- specific stuff?
+//       by wxX11, should we continue to use GTK/Motif-specific stuff?

 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 #if defined(__WXGTK__) || defined(__WXMOTIF__)

+    #define wxHAS_GUI_FDIOMANAGER

     #define wxHAS_GUI_PROCESS_CALLBACKS
     #define wxHAS_GUI_PROCESS_CALLBACKS

-    #define wxHAS_GUI_SOCKET_MANAGER
-#endif
+#endif // ports using wxFDIOManager

 
 

-#ifdef __DARWIN__
+#if defined(__WXMAC__)
+    #define wxHAS_GUI_PROCESS_CALLBACKS

     #define wxHAS_GUI_SOCKET_MANAGER
 #endif
 
     #define wxHAS_GUI_SOCKET_MANAGER
 #endif
 


@@ -50,9 +51,6 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);

-#ifdef wxHAS_GUI_PROCESS_CALLBACKS
-    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
-#endif

 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif


@@ -62,27 +60,33 @@ public:
 #endif
 
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
 #endif
 
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS

-    virtual wxStandardPathsBase& GetStandardPaths();
+    virtual wxStandardPaths& GetStandardPaths();

 #endif
     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
 #endif
     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 

-#if defined(__WXGTK__) && wxUSE_INTL
-    virtual void SetLocale();
-#endif // __WXGTK__
-

 #ifdef __WXGTK20__
     virtual wxString GetDesktopEnvironment() const;
     virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
                                                wxArrayString& desc) const;
 #endif // __WXGTK20____
 
 #ifdef __WXGTK20__
     virtual wxString GetDesktopEnvironment() const;
     virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
                                                wxArrayString& desc) const;
 #endif // __WXGTK20____
 

-#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+#if defined(__WXGTK20__)

     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 

-#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
-    virtual GSocketManager *GetSocketManager();
+#if wxUSE_SOCKETS
+
+#ifdef wxHAS_GUI_SOCKET_MANAGER
+    virtual wxSocketManager *GetSocketManager();
+#endif
+
+#ifdef wxHAS_GUI_FDIOMANAGER
+    virtual wxFDIOManager *GetFDIOManager();

 #endif
 #endif

+
+#endif // wxUSE_SOCKETS
+
+    virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI