mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10150] Disableand exclude code use for gui promt from G3D

Browse source 
* It mostly useless becase we use console error reporting way for other cases
* It have porblem with G3D_OSX based build

Original patch provided by Imbecile.
This commit is contained in:
VladimirMangos 2010-07-04 23:50:39 +04:00
parent 0cb3a01833
commit 59871ac550
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dep/src/g3dlite/prompt.cpp
View file

@ -21,6 +21,7 @@
# define _getch getchar # define _getch getchar
#endif #endif
#if 0 /* MANGOS exclude for disabled gui prompt */
#ifdef G3D_OSX #ifdef G3D_OSX
/*#ifdef __LP64__ /*#ifdef __LP64__
@ -37,9 +38,11 @@
*/ */
#endif #endif
#endif /* MANGOS exclude for disabled gui prompt */
namespace G3D { namespace G3D {
#if 0 /* MANGOS exclude for disabled gui prompt */
#ifdef G3D_WIN32 #ifdef G3D_WIN32
namespace _internal { namespace _internal {
@ -469,6 +472,7 @@ static int guiPrompt(
} }
#endif #endif
#endif /* MANGOS exclude for disabled gui prompt */
/** /**
@ -531,6 +535,8 @@ static int textPrompt(
return c; return c;
} }
#if 0 /* MANGOS exclude for disabled gui prompt */
#ifdef G3D_OSX #ifdef G3D_OSX
// See http://developer.apple.com/documentation/Carbon/Reference/Carbon_Event_Manager_Ref/index.html // See http://developer.apple.com/documentation/Carbon/Reference/Carbon_Event_Manager_Ref/index.html
@ -689,13 +695,15 @@ static int guiPrompt
#endif #endif
#endif /* MANGOS exclude for disabled gui prompt */
int prompt( int prompt(
const char* windowTitle, const char* windowTitle,
const char* prompt, const char* prompt,
const char** choice, const char** choice,
int numChoices, int numChoices,
bool useGui) { bool useGui) {
#if 0 /* MANGOS: disable guid prompt at all platforms, MacOS case have build problems, other just useless */
#ifdef G3D_WIN32 #ifdef G3D_WIN32
if (useGui) { if (useGui) {
// Build the message box // Build the message box
@ -709,6 +717,7 @@ int prompt(
return guiPrompt(windowTitle, prompt, choice, numChoices); return guiPrompt(windowTitle, prompt, choice, numChoices);
} }
#endif #endif
#endif /* MANGOS exclude for disabled gui prompt */
return textPrompt(windowTitle, prompt, choice, numChoices); return textPrompt(windowTitle, prompt, choice, numChoices);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10149" #define REVISION_NR "10150"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__