This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
		
			
				
	
	
		
			97 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| ///////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/unix/apptrait.h
 | |
| // Purpose:     standard implementations of wxAppTraits for Unix
 | |
| // Author:      Vadim Zeitlin
 | |
| // Modified by:
 | |
| // Created:     23.06.2003
 | |
| // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 | |
| // Licence:     wxWindows licence
 | |
| ///////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_UNIX_APPTRAIT_H_
 | |
| #define _WX_UNIX_APPTRAIT_H_
 | |
| 
 | |
| // ----------------------------------------------------------------------------
 | |
| // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 | |
| // ----------------------------------------------------------------------------
 | |
| 
 | |
| class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 | |
| {
 | |
| public:
 | |
| #if wxUSE_CONSOLE_EVENTLOOP
 | |
|     virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
 | |
| #endif // wxUSE_CONSOLE_EVENTLOOP
 | |
| #if wxUSE_TIMER
 | |
|     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
 | |
| #endif
 | |
| };
 | |
| 
 | |
| #if wxUSE_GUI
 | |
| 
 | |
| // GTK+ and Motif integrate sockets and child processes monitoring directly in
 | |
| // their main loop, the other Unix ports do it at wxEventLoop level and so use
 | |
| // the non-GUI traits and don't need anything here
 | |
| //
 | |
| // 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?
 | |
| #if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXQT__)
 | |
|     #define wxHAS_GUI_FDIOMANAGER
 | |
|     #define wxHAS_GUI_PROCESS_CALLBACKS
 | |
| #endif // ports using wxFDIOManager
 | |
| 
 | |
| #if defined(__WXMAC__)
 | |
|     #define wxHAS_GUI_PROCESS_CALLBACKS
 | |
|     #define wxHAS_GUI_SOCKET_MANAGER
 | |
| #endif
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 | |
| {
 | |
| public:
 | |
|     virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
 | |
|     virtual int WaitForChild(wxExecuteData& execData) wxOVERRIDE;
 | |
| #if wxUSE_TIMER
 | |
|     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
 | |
| #endif
 | |
| #if wxUSE_THREADS && defined(__WXGTK20__)
 | |
|     virtual void MutexGuiEnter();
 | |
|     virtual void MutexGuiLeave();
 | |
| #endif
 | |
| 
 | |
| #if defined(__WXMAC__) && wxUSE_STDPATHS
 | |
|     virtual wxStandardPaths& GetStandardPaths();
 | |
| #endif
 | |
|     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE;
 | |
| 
 | |
| #ifdef __WXGTK20__
 | |
|     virtual wxString GetDesktopEnvironment() const;
 | |
|     virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
 | |
|                                                wxArrayString& desc) const;
 | |
| #endif // __WXGTK20____
 | |
| 
 | |
| #if defined(__WXGTK20__)
 | |
|     virtual bool ShowAssertDialog(const wxString& msg);
 | |
| #endif
 | |
| 
 | |
| #if wxUSE_SOCKETS
 | |
| 
 | |
| #ifdef wxHAS_GUI_SOCKET_MANAGER
 | |
|     virtual wxSocketManager *GetSocketManager();
 | |
| #endif
 | |
| 
 | |
| #ifdef wxHAS_GUI_FDIOMANAGER
 | |
|     virtual wxFDIOManager *GetFDIOManager();
 | |
| #endif
 | |
| 
 | |
| #endif // wxUSE_SOCKETS
 | |
| 
 | |
| #if wxUSE_EVENTLOOP_SOURCE
 | |
|     virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() wxOVERRIDE;
 | |
| #endif
 | |
| };
 | |
| 
 | |
| #endif // wxUSE_GUI
 | |
| 
 | |
| #endif // _WX_UNIX_APPTRAIT_H_
 | |
| 
 |