m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed mountlist.c for Mac OS X again.

Browse Source 
- Removed the SDL centered window attribute.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@688 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet 2009-03-20 13:27:39 +00:00
parent f342ff5ff7
commit cf99da06b8
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Grafx2.xcodeproj/xx.pbxuser
View File

@ -165,8 +165,8 @@
PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Warnings_ColumnID,
); );
}; };
PBXPerProjectTemplateStateSaveDate = 258909867; PBXPerProjectTemplateStateSaveDate = 259247013;
PBXWorkspaceStateSaveDate = 258909867; PBXWorkspaceStateSaveDate = 259247013;
}; };
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = { userBuildSettings = {

18
Grafx2.xcodeproj/xx.perspective
View File

@ -494,7 +494,7 @@
<real>418</real> <real>418</real>
</array> </array>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>146 -297 1487 657 0 0 1024 746 </string> <string>-504 88 1487 657 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXSmartGroupTreeModule</string> <string>PBXSmartGroupTreeModule</string>
@ -533,7 +533,7 @@
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {1047, 0}}</string> <string>{{0, 0}, {1047, 0}}</string>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>146 -297 1487 657 0 0 1024 746 </string> <string>-504 88 1487 657 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXNavigatorGroup</string> <string>PBXNavigatorGroup</string>
@ -551,7 +551,7 @@
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
<dict> <dict>
<key>PBXBuildLogShowsTranscriptDefaultKey</key> <key>PBXBuildLogShowsTranscriptDefaultKey</key>
<string>{{0, 107}, {1047, 477}}</string> <string>{{0, 15}, {1047, 569}}</string>
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>XCMainBuildResultsModuleGUID</string> <string>XCMainBuildResultsModuleGUID</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
@ -566,7 +566,7 @@
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {1047, 584}}</string> <string>{{10, 27}, {1047, 584}}</string>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>146 -297 1487 657 0 0 1024 746 </string> <string>-504 88 1487 657 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXBuildResultsModule</string> <string>PBXBuildResultsModule</string>
@ -646,14 +646,14 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>F5CDCE430F6EB68600B31F63</string> <string>F5B724900F73CBB1004960D2</string>
<string>1CA23EE50692099D00951B8B</string> <string>1CA23EE50692099D00951B8B</string>
<string>F5CDCE440F6EB68600B31F63</string> <string>F5B724910F73CBB1004960D2</string>
<string>F5A33EC20EC89C3000F8052D</string> <string>F5A33EC20EC89C3000F8052D</string>
<string>F5CDCE450F6EB68600B31F63</string> <string>F5B724920F73CBB1004960D2</string>
<string>XCMainBuildResultsModuleGUID</string> <string>XCMainBuildResultsModuleGUID</string>
<string>1CA23EE80692099D00951B8B</string> <string>1CA23EE80692099D00951B8B</string>
<string>F5CDCE460F6EB68600B31F63</string> <string>F5B724930F73CBB1004960D2</string>
</array> </array>
<key>ToolbarConfiguration</key> <key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildAndRun</string> <string>xcode.toolbar.config.buildAndRun</string>
@ -827,7 +827,7 @@
<string>/Users/xx/Grafx2/Grafx2.xcodeproj</string> <string>/Users/xx/Grafx2/Grafx2.xcodeproj</string>
</array> </array>
<key>WindowString</key> <key>WindowString</key>
<string>146 -297 1487 657 0 0 1024 746 </string> <string>-504 88 1487 657 0 0 1024 746 </string>
<key>WindowTools</key> <key>WindowTools</key>
<array> <array>
<dict> <dict>

3
main.c
View File

@ -377,9 +377,6 @@ int Initialisation_du_programme(int argc,char * argv[])
Brouillon_Loupe_Decalage_X=0; Brouillon_Loupe_Decalage_X=0;
Brouillon_Loupe_Decalage_Y=0; Brouillon_Loupe_Decalage_Y=0;
SDL_putenv("SDL_VIDEO_WINDOW_POS=center");
SDL_putenv("SDL_VIDEO_CENTERED=1");
// SDL // SDL
if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO|SDL_INIT_JOYSTICK) < 0) if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO|SDL_INIT_JOYSTICK) < 0)
{ {

8
mountlist.c
View File

@ -20,7 +20,7 @@
#if(!defined(__WIN32__))&&(!defined(__amigaos4__))&&(!defined(__AROS__))&&(!defined(__MORPHOS__)) #if(!defined(__WIN32__))&&(!defined(__amigaos4__))&&(!defined(__AROS__))&&(!defined(__MORPHOS__))
// We don't use autoconf and all that in grafx2, so let's do the config here ... // We don't use autoconf and all that in grafx2, so let's do the config here ...
#if defined(__macosx__)||defined(__FreeBSD__) // MacOS X is POSIX compliant #if defined(__macosx__) || defined(__FreeBSD__) // MacOS X is POSIX compliant
#define MOUNTED_GETMNTINFO #define MOUNTED_GETMNTINFO
#elif defined(__BEOS__) || defined(__HAIKU__) #elif defined(__BEOS__) || defined(__HAIKU__)
#define MOUNTED_FS_STAT_DEV #define MOUNTED_FS_STAT_DEV
@ -191,7 +191,7 @@
|| strcmp (Fs_type, "cifs") == 0))) || strcmp (Fs_type, "cifs") == 0)))
#endif #endif
#if MOUNTED_GETMNTINFO #ifdef MOUNTED_GETMNTINFO
# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
static char * static char *
@ -439,7 +439,11 @@ read_file_system_list (bool need_fs_type)
me = malloc (sizeof *me); me = malloc (sizeof *me);
me->me_devname = strdup (fsp->f_mntfromname); me->me_devname = strdup (fsp->f_mntfromname);
me->me_mountdir = strdup (fsp->f_mntonname); me->me_mountdir = strdup (fsp->f_mntonname);
#if defined(__macosx__)
me->me_type = fsp->f_fstypename;
#else
me->me_type = fsp->fs_typename; me->me_type = fsp->fs_typename;
#endif
me->me_type_malloced = 0; me->me_type_malloced = 0;
me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
me->me_remote = ME_REMOTE (me->me_devname, me->me_type); me->me_remote = ME_REMOTE (me->me_devname, me->me_type);