Merge branch 'fixwarn' into 'master'

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

diff --git a/contrib/camera/funchandlers.cpp b/contrib/camera/funchandlers.cpp
index 8f568877d8b531683ec9b5d5accfc2a878206529..4134a889eda465366e89e360b87173420e267b3a 100644 (file)
--- a/contrib/camera/funchandlers.cpp
+++ b/contrib/camera/funchandlers.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -29,10 +29,12 @@
 extern GtkWidget *g_pEditModeAddRadioButton;
 
 char* Q_realpath( const char *path, char *resolved_path, size_t size ){
-#if defined  ( __linux__ ) || defined ( __APPLE__ )
+#if defined( POSIX )
        return realpath( path, resolved_path );
-#else
+#elif defined( WIN32 )
        return _fullpath( resolved_path, path, size );
+#else
+#error "unsupported platform"
 #endif
 }
 
@@ -65,7 +67,7 @@ static void DoNewCamera( idCameraPosition::positionType type ){
                }
        }
        else {
-               g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free cameras available.", "Create Camera Error", MB_OK, NULL );
+               g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free cameras available.", "Create Camera Error", eMB_OK );
        }
 }
 
@@ -96,13 +98,13 @@ void DoLoadCamera(){
        char basepath[PATH_MAX];
 
        if ( firstCam && firstCam->HasBeenSaved() ) {
-               CAMERA_ExtractFilePath( firstCam->GetFileName(), basepath );
+               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", NULL );
+       const gchar *filename = g_FuncTable.m_pfnFileDialog( (GtkWidget *)g_pRadiantWnd, TRUE, "Open Camera File", basepath, "camera" );
 
        if ( filename ) {
                CCamera *cam = AllocCam();
@@ -118,7 +120,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", MB_OK, NULL );
+                                       g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", eMB_OK );
                                        //g_free( filename );
                                        return;
                                }
@@ -136,13 +138,13 @@ 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", MB_OK, NULL );
+                               g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", eMB_OK );
                        }
 
                        //g_free( filename );
                }
                else {
-                       g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free camera slots available", "Load error", MB_OK, NULL );
+                       g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "No free camera slots available", "Load error", eMB_OK );
                }
        }
 }
@@ -155,13 +157,13 @@ void DoSaveCamera() {
        }
 
        if ( GetCurrentCam()->GetFileName()[0] ) {
-               CAMERA_ExtractFilePath( GetCurrentCam()->GetFileName(), basepath );
+               ExtractFilePath( GetCurrentCam()->GetFileName(), basepath );
        }
        else{
                strcpy( basepath, g_FuncTable.m_pfnGetGamePath() );
        }
 
-       const gchar *filename = g_FuncTable.m_pfnFileDialog( (void *)g_pRadiantWnd, FALSE, "Save Camera File", basepath, "camera", NULL );
+       const gchar *filename = g_FuncTable.m_pfnFileDialog( g_pRadiantWnd, FALSE, "Save Camera File", basepath, "camera" );
 
        if ( filename ) {
                char fullpathtofile[PATH_MAX + 8];
@@ -174,7 +176,7 @@ void DoSaveCamera() {
                        strcat( fullpathtofile, ".camera" );
 
                        if ( FileExists( fullpathtofile ) ) {
-                               if ( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "File already exists.\nOverwrite?", "Save Camera File", MB_YESNO, NULL ) == IDNO ) {
+                               if ( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, "File already exists.\nOverwrite?", "Save Camera File", eMB_YESNO ) == eIDNO ) {
                                        return;
                                }
                        }
@@ -191,8 +193,8 @@ 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", MB_OK, NULL );
+                               sprintf( error, "Camera file \'%s\' is currently loaded by NetRadiant.\nPlease select a different filename.", fullpathtofile );
+                               g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Save error", eMB_OK );
                                return;
                        }
                        checkCam = checkCam->GetNext();
@@ -214,14 +216,14 @@ 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", MB_YESNO, NULL ) == IDYES ) {
+               if ( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, buf, "Warning", eMB_YESNO ) == eIDYES ) {
                        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", MB_YESNO, NULL ) == IDYES ) {
+               if ( g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, buf, "Warning", eMB_YESNO ) == eIDYES ) {
                        DoSaveCamera();
                }
        }