Menu
▾
▴
[vba-commit] VisualBoyAdvance/src/win32 Directories.cpp, 1.4, 1.5 Directories.h, 1.3, 1.4 MainWnd.cpp, 1.25, 1.26 MainWndFile.cpp, 1.18, 1.19 VBA.cpp, 1.20, 1.21 resource.h, 1.48, 1.49 vba.rc, 1.61, 1.62
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26575/src/win32 Modified Files: Directories.cpp Directories.h MainWnd.cpp MainWndFile.cpp VBA.cpp resource.h vba.rc Log Message: Added relative paths support Index: Directories.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Directories.h 26 May 2006 14:38:47 -0000 1.3 --- Directories.h 4 Aug 2006 11:24:24 -0000 1.4 *************** *** 76,81 **** //}}AFX_MSG DECLARE_MESSAGE_MAP() ! public: ! // afx_msg void OnBnClickedOk(); }; --- 76,96 ---- //}}AFX_MSG DECLARE_MESSAGE_MAP() ! private: ! ! bool directoryDoesExist(const char *directory) ! { // returns true if the directory does exist ! HANDLE hDir; ! hDir = CreateFile( ! directory, ! GENERIC_READ, ! FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, ! NULL, ! OPEN_EXISTING, ! FILE_FLAG_BACKUP_SEMANTICS, ! NULL ); ! bool retval = (hDir == INVALID_HANDLE_VALUE) ? false : true; ! CloseHandle( hDir ); ! return retval; ! } }; Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** VBA.cpp 31 Jul 2006 15:51:01 -0000 1.20 --- VBA.cpp 4 Aug 2006 11:24:24 -0000 1.21 *************** *** 26,29 **** --- 26,30 ---- #include "Reg.h" #include "resource.h" + #include "resource2.h" #include "skin.h" #include "WavWriter.h" *************** *** 1328,1334 **** ifbType = 0; ! winFlashSize = regQueryDwordValue("flashSize", 0x20000); if(winFlashSize != 0x10000 && winFlashSize != 0x20000) ! winFlashSize = 0x20000; flashSize = winFlashSize; --- 1329,1335 ---- ifbType = 0; ! winFlashSize = regQueryDwordValue("flashSize", 0x10000); if(winFlashSize != 0x10000 && winFlashSize != 0x20000) ! winFlashSize = 0x10000; flashSize = winFlashSize; Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MainWndFile.cpp 21 Jun 2006 16:58:15 -0000 1.18 --- MainWndFile.cpp 4 Aug 2006 11:24:24 -0000 1.19 *************** *** 20,23 **** --- 20,25 ---- #include "MainWnd.h" + #include <shlwapi.h> + #include "ExportGSASnapshot.h" #include "FileDlg.h" *************** *** 186,189 **** --- 188,201 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 233,236 **** --- 245,258 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 275,278 **** --- 297,310 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 317,320 **** --- 349,362 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 346,349 **** --- 388,401 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 463,466 **** --- 515,528 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 560,563 **** --- 622,635 ---- CString capdir = regQueryStringValue("captureDir", ""); + if( capdir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, capdir ); + capdir = baseDir; + } if(capdir.IsEmpty()) capdir = getDirFromFile(theApp.filename); *************** *** 714,717 **** --- 786,799 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 758,761 **** --- 840,853 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 800,803 **** --- 892,905 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 844,847 **** --- 946,959 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) Index: Directories.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Directories.cpp 27 May 2006 14:47:33 -0000 1.4 --- Directories.cpp 4 Aug 2006 11:24:24 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- #include <shlobj.h> + #include <shlwapi.h> #ifdef _DEBUG *************** *** 200,220 **** void Directories::OnOK() { ! CString buffer; ! m_romPath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("romdir", buffer); ! m_gbromPath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("gbromdir", buffer); ! m_batteryPath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("batteryDir", buffer); ! m_savePath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("saveDir", buffer); ! m_capturePath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("captureDir", buffer); ! EndDialog(TRUE); } --- 201,274 ---- void Directories::OnOK() { ! char baseDir[MAX_PATH+1]; ! char temp[MAX_PATH+1]; ! GetModuleFileName( NULL, baseDir, MAX_PATH ); ! baseDir[MAX_PATH] = '\0'; // for security reasons ! PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash ! ! ! CString buffer; ! ! m_romPath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "romdir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_gbromPath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "gbromdir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_batteryPath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "batteryDir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_savePath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "saveDir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_capturePath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "captureDir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! EndDialog(TRUE); } Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MainWnd.cpp 1 Aug 2006 19:21:16 -0000 1.25 --- MainWnd.cpp 4 Aug 2006 11:24:24 -0000 1.26 *************** *** 25,28 **** --- 25,29 ---- #include <winsock.h> + #include <shlwapi.h> #include "FileDlg.h" *************** *** 766,769 **** --- 767,780 ---- name = theApp.filename; CString dir = regQueryStringValue("saveDir", NULL); + if( dir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, dir ); + dir = baseDir; + } if(!dir.GetLength()) *************** *** 798,801 **** --- 809,822 ---- name = theApp.filename; CString dir = regQueryStringValue("saveDir", NULL); + if( dir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, dir ); + dir = baseDir; + } if(!dir.GetLength()) *************** *** 860,863 **** --- 881,894 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 887,890 **** --- 918,931 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 998,1001 **** --- 1039,1053 ---- } + if( initialDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, initialDir ); + initialDir = baseDir; + } + if( !initialDir.IsEmpty() ) { theApp.dir = initialDir; *************** *** 1034,1042 **** theApp.dir = theApp.dir.Left( theApp.dir.GetLength() - 1 ); } ! if( gb ) { ! regSetStringValue( _T("gbromdir"), theApp.dir ); ! } else { ! regSetStringValue( _T("romdir"), theApp.dir ); ! } return true; } --- 1086,1090 ---- theApp.dir = theApp.dir.Left( theApp.dir.GetLength() - 1 ); } ! SetCurrentDirectory( theApp.dir ); return true; } *************** *** 1074,1077 **** --- 1122,1135 ---- CString captureDir = regQueryStringValue("captureDir", ""); + if( captureDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, captureDir ); + captureDir = baseDir; + } int index = theApp.filename.ReverseFind('\\'); Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** vba.rc 3 Aug 2006 16:52:11 -0000 1.61 --- vba.rc 4 Aug 2006 11:24:24 -0000 1.62 *************** *** 9,13 **** // #include "afxres.h" ! #include "vba.rc2" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS --- 9,13 ---- // #include "afxres.h" ! #include "resource2.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS *************** *** 36,46 **** BEGIN "#include ""afxres.h""\r\n" ! "#include ""vba.rc2""\0" END 3 TEXTINCLUDE BEGIN ! "\r\n" ! "\0" END --- 36,45 ---- BEGIN "#include ""afxres.h""\r\n" ! "#include ""resource2.h""\0" END 3 TEXTINCLUDE BEGIN ! "#include ""vba.rc2""\0" END *************** *** 72,81 **** END ! IDD_ABOUT DIALOGEX 0, 0, 154, 78 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON 107,IDC_STATIC,6,6,20,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 --- 71,81 ---- END ! IDD_ABOUT DIALOGEX 0, 0, 157, 78 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + EXSTYLE WS_EX_TOOLWINDOW CAPTION "About" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON 101,IDC_STATIC,6,6,20,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 *************** *** 86,116 **** END ! IDD_DIRECTORIES DIALOGEX 0, 0, 284, 129 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Directories" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! PUSHBUTTON "Browse...",IDC_ROM_DIR,174,7,50,14 ! PUSHBUTTON "Browse...",IDC_GBROM_DIR,174,26,50,14 ! PUSHBUTTON "Browse...",IDC_BATTERY_DIR,174,45,50,14 ! PUSHBUTTON "Browse...",IDC_SAVE_DIR,174,64,50,14 ! PUSHBUTTON "Browse...",IDC_CAPTURE_DIR,174,83,50,14 ! DEFPUSHBUTTON "OK",IDOK,88,108,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,145,108,50,14 ! LTEXT "ROM:",IDC_STATIC,7,9,20,8 ! LTEXT "Battery:",IDC_STATIC,7,47,25,8 ! LTEXT "Save Game:",IDC_STATIC,7,66,40,8 ! LTEXT "Capture:",IDC_STATIC,7,85,28,8 ! EDITTEXT IDC_ROM_PATH,49,7,121,14,ES_AUTOHSCROLL ! EDITTEXT IDC_BATTERY_PATH,49,45,121,14,ES_AUTOHSCROLL ! EDITTEXT IDC_SAVE_PATH,49,64,121,14,ES_AUTOHSCROLL ! EDITTEXT IDC_CAPTURE_PATH,49,83,121,14,ES_AUTOHSCROLL ! LTEXT "GB ROM:",IDC_STATIC,7,28,32,8 ! EDITTEXT IDC_GBROM_PATH,49,26,121,14,ES_AUTOHSCROLL ! PUSHBUTTON "Reset",IDC_ROM_DIR_RESET,228,6,50,14 ! PUSHBUTTON "Reset",IDC_GBROM_DIR_RESET,228,25,50,14 ! PUSHBUTTON "Reset",IDC_BATTERY_DIR_RESET,228,45,50,14 ! PUSHBUTTON "Reset",IDC_SAVE_DIR_RESET,228,64,50,14 ! PUSHBUTTON "Reset",IDC_CAPTURE_DIR_RESET,228,83,50,14 END --- 86,119 ---- END ! IDD_DIRECTORIES DIALOGEX 0, 0, 220, 301 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + EXSTYLE WS_EX_TOOLWINDOW CAPTION "Directories" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! PUSHBUTTON "Browse...",IDC_ROM_DIR,12,66,90,12 ! PUSHBUTTON "Browse...",IDC_GBROM_DIR,12,114,90,12 ! PUSHBUTTON "Browse...",IDC_BATTERY_DIR,12,162,90,12 ! PUSHBUTTON "Browse...",IDC_SAVE_DIR,12,210,90,12 ! PUSHBUTTON "Browse...",IDC_CAPTURE_DIR,12,258,90,12 ! DEFPUSHBUTTON "OK",IDOK,120,282,42,12 ! PUSHBUTTON "Cancel",IDCANCEL,168,282,42,12 ! EDITTEXT IDC_ROM_PATH,12,54,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_BATTERY_PATH,12,150,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_SAVE_PATH,12,198,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_CAPTURE_PATH,12,246,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_GBROM_PATH,12,102,198,12,ES_AUTOHSCROLL ! PUSHBUTTON "Reset",IDC_ROM_DIR_RESET,120,66,90,12 ! PUSHBUTTON "Reset",IDC_GBROM_DIR_RESET,120,114,84,12 ! PUSHBUTTON "Reset",IDC_BATTERY_DIR_RESET,120,162,90,12 ! PUSHBUTTON "Reset",IDC_SAVE_DIR_RESET,120,210,90,12 ! PUSHBUTTON "Reset",IDC_CAPTURE_DIR_RESET,120,258,90,12 ! CONTROL "You can either select or enter absolute paths to directories,\nor you can use relative paths by beginning with a . (point).\nExamples: c:\\emulation\\roms | .\\battery | ..\\snapshots\\gba",IDC_STATIC, ! "Static",SS_LEFTNOWORDWRAP | WS_GROUP,6,6,210,30,WS_EX_STATICEDGE ! GROUPBOX "Game Boy Advance ROM Images",IDC_STATIC,6,42,210,42 ! GROUPBOX "Game Boy / Game Boy Color ROM Images",IDC_STATIC,6,90,210,42 ! GROUPBOX "Game Boy Internal Battery Saves",IDC_STATIC,6,138,210,42 ! GROUPBOX "Visual Boy Advance Save Games",IDC_STATIC,6,186,210,42 ! GROUPBOX "Screenshots",IDC_STATIC,6,234,210,42 END *************** *** 1052,1056 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 147 TOPMARGIN, 7 BOTTOMMARGIN, 71 --- 1055,1059 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 150 TOPMARGIN, 7 BOTTOMMARGIN, 71 *************** *** 1060,1066 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 277 TOPMARGIN, 7 ! BOTTOMMARGIN, 122 END --- 1063,1069 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 213 TOPMARGIN, 7 ! BOTTOMMARGIN, 294 END *************** *** 2044,2049 **** // Generated from the TEXTINCLUDE 3 resource. // ! ! ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED --- 2047,2051 ---- // Generated from the TEXTINCLUDE 3 resource. // ! #include "vba.rc2" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** resource.h 3 Aug 2006 16:52:11 -0000 1.48 --- resource.h 4 Aug 2006 11:24:24 -0000 1.49 *************** *** 53,57 **** #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 - #define IDI_ICON 107 #define IDD_ADD_CHEAT 108 #define IDD_DIRECTORIES 109 --- 53,56 ---- |
