Backing out commit 483. Going to set linker flags instead.

[xonotic/netradiant.git] / contrib / camera / funchandlers.cpp

diff --git a/contrib/camera/funchandlers.cpp b/contrib/camera/funchandlers.cpp
index 85af8335bc4dde0cdfe776cb03b799cb2291848e..6423d3997b7e528ec087428e037fdae9c54d6acd 100644 (file)
--- a/contrib/camera/funchandlers.cpp
+++ b/contrib/camera/funchandlers.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.
@@ -65,7 +65,7 @@ static void DoNewCamera( idCameraPosition::positionType type )
                if( !g_bEditOn )
                        DoStartEdit( GetCurrentCam() );
        } else {
-      g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free cameras available.", "Create Camera Error", eMB_OK );
+      g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free cameras available.", "Create Camera Error", MB_OK, NULL );
        }
 }
 
@@ -102,11 +102,11 @@ void DoLoadCamera()
   char basepath[PATH_MAX];
 
        if( firstCam && firstCam->HasBeenSaved() )
-    ExtractFilePath( firstCam->GetFileName(), basepath );
+    CAMERA_ExtractFilePath( firstCam->GetFileName(), basepath );
   else
     strcpy( basepath, g_FuncTable.m_pfnGetGamePath() );
 
-  const gchar *filename = g_FuncTable.m_pfnFileDialog( (GtkWidget *)g_pRadiantWnd, TRUE, "Open Camera File", basepath, "camera");
+  const gchar *filename = g_FuncTable.m_pfnFileDialog( (GtkWidget *)g_pRadiantWnd, TRUE, "Open Camera File", basepath, "camera", NULL);
 
   if( filename )
        {
@@ -123,7 +123,7 @@ void DoLoadCamera()
           char error[PATH_MAX+64];
           FreeCam( cam );
           sprintf( error, "Camera file \'%s\' is already loaded", fullpathtofile );
-          g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", eMB_OK );
+          g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", MB_OK, NULL );
           //g_free( filename );
           return;
         }
@@ -140,12 +140,12 @@ void DoLoadCamera()
         char error[PATH_MAX+64];
         FreeCam( cam );
         sprintf( error, "An error occured during the loading of \'%s\'", fullpathtofile );
-        g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", eMB_OK );
+        g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", MB_OK, NULL );
       }
 
       //g_free( filename );
     } else {
-      g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free camera slots available", "Load error", eMB_OK );
+               g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free camera slots available", "Load error", MB_OK, NULL );
          }
        }
 }
@@ -157,11 +157,11 @@ void DoSaveCamera() {
     return;
 
   if( GetCurrentCam()->GetFileName()[0] )
-    ExtractFilePath( GetCurrentCam()->GetFileName(), basepath );
+    CAMERA_ExtractFilePath( GetCurrentCam()->GetFileName(), basepath );
   else
     strcpy( basepath, g_FuncTable.m_pfnGetGamePath() );
 
-  const gchar *filename = g_FuncTable.m_pfnFileDialog( g_pRadiantWnd, FALSE, "Save Camera File", basepath, "camera");
+  const gchar *filename = g_FuncTable.m_pfnFileDialog( (void *)g_pRadiantWnd, FALSE, "Save Camera File", basepath, "camera", NULL);
 
   if( filename ) {
     char fullpathtofile[PATH_MAX + 8];
@@ -174,8 +174,9 @@ void DoSaveCamera() {
                        strcat( fullpathtofile, ".camera" );
 
                        if( FileExists( fullpathtofile ) ) {
-                               if( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "File already exists.\nOverwrite?", "Save Camera File", eMB_YESNO ) == eIDNO ) 
+                               if ( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "File already exists.\nOverwrite?", "Save Camera File", MB_YESNO, NULL ) == IDNO ) {
                                        return;
+                               }
                        }
                }
 
@@ -189,7 +190,7 @@ void DoSaveCamera() {
       } else if( !strcmp( fullpathtofile, checkCam->GetFileName() ) ) {
         char error[PATH_MAX+64];
         sprintf( error, "Camera file \'%s\' is currently loaded by GtkRadiant.\nPlease select a different filename.", fullpathtofile );
-        g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Save error", eMB_OK );
+               g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Save error", MB_OK, NULL );
         return;
       }
       checkCam = checkCam->GetNext();
@@ -210,13 +211,15 @@ void DoUnloadCamera() {
        if( !GetCurrentCam()->HasBeenSaved() ) {
                char buf[PATH_MAX+64];
                sprintf( buf, "Do you want to save the changes for camera '%s'?", GetCurrentCam()->GetCam()->getName() );
-               if( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, buf, "Warning", eMB_YESNO ) == eIDYES ) 
+               if ( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, buf, "Warning", MB_YESNO, NULL ) == IDYES ) {
                        DoSaveCamera();
+               }
        } else if( GetCurrentCam()->HasBeenSaved() == 2 ) {
                char buf[PATH_MAX+64];
                sprintf( buf, "Do you want to save the changes made to camera file '%s'?", GetCurrentCam()->GetFileName() );
-               if( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, buf, "Warning", eMB_YESNO ) == eIDYES ) 
+               if( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, buf, "Warning", MB_YESNO, NULL ) == IDYES ) {
                        DoSaveCamera();
+               }
        }
 
   if( g_pCurrentEditCam ) {