From: David Elliott Date: Sun, 18 Jan 2004 20:17:29 +0000 (+0000) Subject: Move GSocketBSDGUIShim from source file to header (we'll need it in a second) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1119a830a89acb4382082a656c9490ca705a334f?ds=inline Move GSocketBSDGUIShim from source file to header (we'll need it in a second) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h index 19e210ae3c..8603d4290b 100644 --- a/include/wx/unix/gsockunx.h +++ b/include/wx/unix/gsockunx.h @@ -112,6 +112,30 @@ struct _GSocket #ifdef __cplusplus } #endif /* __cplusplus */ +#else +/////////////////////////////////////////////////////////////////////////// +// GSocketBSDGUIShim +class GSocketBSDGUIShim:public GSocketBSD +{ + friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc); +public: + static inline bool GUI_Init(); + static inline void GUI_Cleanup(); + static inline bool UseGUI(); + GSocketBSDGUIShim(); + virtual ~GSocketBSDGUIShim(); +protected: + virtual void EventLoop_Enable_Events(); + virtual void EventLoop_Disable_Events(); + virtual void EventLoop_Install_Callback(GSocketEvent event); + virtual void EventLoop_Uninstall_Callback(GSocketEvent event); +private: +/* Table of GUI-related functions. We must call them indirectly because + * of wxBase and GUI separation: */ + + static struct GSocketGUIFunctionsTable *ms_gui_functions; +}; + #endif //ndef wxUSE_GSOCKET_CPLUSPLUS #ifdef __cplusplus diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index b1192c0555..edf43f5a06 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -158,27 +158,6 @@ int _System soclose(int); /////////////////////////////////////////////////////////////////////////// // GSocketBSDGUIShim -class GSocketBSDGUIShim:public GSocketBSD -{ - friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc); -public: - static inline bool GUI_Init(); - static inline void GUI_Cleanup(); - static inline bool UseGUI(); - GSocketBSDGUIShim(); - virtual ~GSocketBSDGUIShim(); -protected: - virtual void EventLoop_Enable_Events(); - virtual void EventLoop_Disable_Events(); - virtual void EventLoop_Install_Callback(GSocketEvent event); - virtual void EventLoop_Uninstall_Callback(GSocketEvent event); -private: -/* Table of GUI-related functions. We must call them indirectly because - * of wxBase and GUI separation: */ - - static struct GSocketGUIFunctionsTable *ms_gui_functions; -}; - struct GSocketGUIFunctionsTable *GSocketBSDGUIShim::ms_gui_functions = NULL; void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)