textool fix (Markus Fischer)

[xonotic/netradiant.git] / plugins / textool / TexTool.cpp

diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp
index 9ba7b01bffd66abe8f7eaf8d0939f9b88ff884ed..ec0fb99f87e560411fde252f38df9455feadb330 100644 (file)
--- a/plugins/textool/TexTool.cpp
+++ b/plugins/textool/TexTool.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+Copyright (C) 1999-2007 id Software, Inc. and contributors.
 For a list of contributors, see the accompanying CONTRIBUTORS file.
 
 This file is part of GtkRadiant.
@@ -38,7 +38,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data)
   ret = (int*)g_object_get_data (G_OBJECT (parent), "ret");
  
   *loop = 0;
-  *ret = gpointer_to_int (data);
+  *ret = (int)data;
 }
  
 static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)
@@ -182,7 +182,7 @@ CWindowListener g_Listen;
 
 // plugin interfaces ---------------------------
 bool                   g_bQglInitDone = false;
-OpenGLBinding          g_QglTable;
+_QERQglTable           g_QglTable;
 bool                   g_bSelectedFaceInitDone = false;
 _QERSelectedFaceTable  g_SelectedFaceTable;
 bool            g_bUITable = false;
@@ -251,8 +251,6 @@ const char* QERPlug_Init (void* hApp, void *pWidget)
   GtkWidget* pMainWidget = static_cast<GtkWidget*>(pWidget);
 
   g_pMainWnd = pMainWidget;
-  memset(&g_FuncTable, 0, sizeof(_QERFuncTable_1));
-  g_FuncTable.m_nSize = sizeof(_QERFuncTable_1);
   size = (int)((winding_t *)0)->points[MAX_POINTS_ON_WINDING];
   g_pSelectedFaceWinding = (winding_t *)malloc( size );
   memset( g_pSelectedFaceWinding, 0, size );
@@ -533,7 +531,7 @@ static void DoExpose ()
   }
 
   // let the control points manager render
-  g_pManager->render( );
+  g_pManager->Render( );
 }
 
 static bool CanProcess ()
@@ -821,14 +819,14 @@ extern "C" void QERPlug_Dispatch(const char* p, vec3_t vMin, vec3_t vMax, bool b
   // if it's the first call, perhaps we need some additional init steps
   if (!g_bQglInitDone)
   {
-    g_QglTable.m_nSize = sizeof(OpenGLBinding);
+    g_QglTable.m_nSize = sizeof(_QERQglTable);
     if ( g_FuncTable.m_pfnRequestInterface( QERQglTable_GUID, static_cast<LPVOID>(&g_QglTable) ) )
     {
       g_bQglInitDone = true;
     }
     else
     {
-      Sys_Printf("TexTool plugin: OpenGLBinding interface request failed\n");
+      Sys_Printf("TexTool plugin: _QERQglTable interface request failed\n");
       return;
     }
   }
@@ -919,8 +917,13 @@ extern "C" void QERPlug_Dispatch(const char* p, vec3_t vMin, vec3_t vMax, bool b
 CSynapseServer* g_pSynapseServer = NULL;
 CSynapseClientTexTool g_SynapseClient;
 
-extern "C" CSynapseClient* SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces (const char *version, CSynapseServer *pServer)
-{
+#if __GNUC__ >= 4
+#pragma GCC visibility push(default)
+#endif
+extern "C" CSynapseClient* SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( const char *version, CSynapseServer *pServer ) {
+#if __GNUC__ >= 4
+#pragma GCC visibility pop
+#endif
   if (strcmp(version, SYNAPSE_VERSION))
   {
     Syn_Printf("ERROR: synapse API version mismatch: should be '" SYNAPSE_VERSION "', got '%s'\n", version);
@@ -934,6 +937,8 @@ extern "C" CSynapseClient* SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces (const
   g_SynapseClient.AddAPI(RADIANT_MAJOR, NULL, sizeof(g_FuncTable), SYN_REQUIRE, &g_FuncTable);
   g_SynapseClient.AddAPI(QGL_MAJOR, NULL, sizeof(g_QglTable), SYN_REQUIRE, &g_QglTable);
   g_SynapseClient.AddAPI(SELECTEDFACE_MAJOR, NULL, sizeof(g_SelectedFaceTable), SYN_REQUIRE, &g_SelectedFaceTable);
+  g_SynapseClient.AddAPI(UI_MAJOR, NULL, sizeof(_QERUITable), SYN_REQUIRE, &g_UITable);
+  g_SynapseClient.AddAPI(APPSURFACEDIALOG_MAJOR, NULL, sizeof(_QERAppSurfaceTable), SYN_REQUIRE, &g_SurfaceTable);
   
   return &g_SynapseClient;
 }