Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed incorrect struct qualifier from GSocketGUIFunctionsTable

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-08-08 04:48:33 +00:00
parent 236d7be301
commit 3e1400ac6a
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/apptrait.h
View File

@@ -24,10 +24,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
class WXDLLEXPORT wxRendererNative; class WXDLLEXPORT wxRendererNative;
class WXDLLIMPEXP_BASE wxString; class WXDLLIMPEXP_BASE wxString;
extern "C" class GSocketGUIFunctionsTable;
{
struct GSocketGUIFunctionsTable;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// toolkit information // toolkit information

2
include/wx/gsocket.h
View File

@@ -118,7 +118,7 @@ public:
/* Sets GUI functions callbacks. Must be called *before* GSocket_Init /* Sets GUI functions callbacks. Must be called *before* GSocket_Init
if the app uses async sockets. */ if the app uses async sockets. */
void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc); void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc);
/* GSocket_Init() must be called at the beginning */ /* GSocket_Init() must be called at the beginning */
int GSocket_Init(void); int GSocket_Init(void);

2
src/mac/carbon/gsocket.cpp
View File

@@ -202,7 +202,7 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
/* Global initialisers */ /* Global initialisers */
void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *table) void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *table)
{ {
// do nothing, wxMac doesn't have wxBase-GUI separation yet // do nothing, wxMac doesn't have wxBase-GUI separation yet
} }

6
src/msw/gsocket.cpp
View File

@@ -92,7 +92,7 @@
/* Table of GUI-related functions. We must call them indirectly because /* Table of GUI-related functions. We must call them indirectly because
* of wxBase and GUI separation: */ * of wxBase and GUI separation: */
static class GSocketGUIFunctionsTable *gs_gui_functions; static GSocketGUIFunctionsTable *gs_gui_functions;
class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
{ {
@@ -122,7 +122,7 @@ void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket))
{} {}
/* Global initialisers */ /* Global initialisers */
void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
{ {
gs_gui_functions = guifunc; gs_gui_functions = guifunc;
} }
@@ -133,7 +133,7 @@ int GSocket_Init(void)
if (!gs_gui_functions) if (!gs_gui_functions)
{ {
static class GSocketGUIFunctionsTableNull table; static GSocketGUIFunctionsTableNull table;
gs_gui_functions = &table; gs_gui_functions = &table;
} }
if ( !gs_gui_functions->OnInit() ) if ( !gs_gui_functions->OnInit() )

6
src/unix/gsocket.cpp
View File

@@ -164,7 +164,7 @@ int _System soclose(int);
/* Table of GUI-related functions. We must call them indirectly because /* Table of GUI-related functions. We must call them indirectly because
* of wxBase and GUI separation: */ * of wxBase and GUI separation: */
static struct GSocketGUIFunctionsTable *gs_gui_functions; static GSocketGUIFunctionsTable *gs_gui_functions;
class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
{ {
@@ -200,7 +200,7 @@ void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket)
{} {}
/* Global initialisers */ /* Global initialisers */
void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
{ {
gs_gui_functions = guifunc; gs_gui_functions = guifunc;
} }
@@ -209,7 +209,7 @@ int GSocket_Init(void)
{ {
if (!gs_gui_functions) if (!gs_gui_functions)
{ {
static class GSocketGUIFunctionsTableNull table; static GSocketGUIFunctionsTableNull table;
gs_gui_functions = &table; gs_gui_functions = &table;
} }
if ( !gs_gui_functions->OnInit() ) if ( !gs_gui_functions->OnInit() )