__FB_GUI__ Cleaned

My last cleaned version
hope it works now

only 1 define as console is default mode, compiled ok with 32 and 64
tested with
#if FB_GUI
#include "windows.bi"
messagebox(0, "Gui mode", "info",0)
#else
print "Console mode"
print : print "Any key to close"
sleep
#endif

Author: marpon

src/compiler/fb.bas

@@ -480,8 +480,8 @@ sub fbGlobalInit()
 	env.clopt.stacksize     = FB_DEFSTACKSIZE
 	env.clopt.objinfo       = TRUE
 	env.clopt.showincludes  = FALSE
-	env.clopt.modeview      = FB_DEFAULT_MODEVIEW  '***** console/gui
-				
+	env.clopt.modeview      = FB_DEFAULT_MODEVIEW
+
 	hUpdateLangOptions( )
 	hUpdateTargetOptions( )
 end sub
@@ -572,8 +572,8 @@ sub fbSetOption( byval opt as integer, byval value as integer )
 		env.clopt.objinfo = value
 	case FB_COMPOPT_SHOWINCLUDES
 		env.clopt.showincludes = value
-	case FB_COMPOPT_MODEVIEW              		'***** console/gui
-		env.clopt.modeview = value         	'***** console/gui  				
+	case FB_COMPOPT_MODEVIEW
+		env.clopt.modeview = value
 	end select
 end sub
 
@@ -646,9 +646,9 @@ function fbGetOption( byval opt as integer ) as integer
 		function = env.clopt.objinfo
 	case FB_COMPOPT_SHOWINCLUDES
 		function = env.clopt.showincludes
-	case FB_COMPOPT_MODEVIEW                	'***** console/gui
-		function = env.clopt.modeview        	'***** console/gui
-		
+	case FB_COMPOPT_MODEVIEW
+		function = env.clopt.modeview
+
 	case else
 		function = 0
 	end select

src/compiler/fb.bi

@@ -92,17 +92,17 @@ enum FB_COMPOPT
 	FB_COMPOPT_STACKSIZE            '' integer
 	FB_COMPOPT_OBJINFO              '' boolean: write/read .fbctinf sections etc.?
 	FB_COMPOPT_SHOWINCLUDES         '' boolean: -showincludes
-	FB_COMPOPT_MODEVIEW             '' new for console gui       '***** console/gui
-	
+	FB_COMPOPT_MODEVIEW             ''__FB_GUI__
+
 	FB_COMPOPTIONS
 end enum
 
-enum FB_MODEVIEW                    		'***** console/gui
-	FB_MODEVIEW_ISCONSOLE = 0        	'***** console/gui
-	FB_MODEVIEW_ISGUI                	'***** console/gui
-end enum 					'***** console/gui
+enum FB_MODEVIEW
+	FB_MODEVIEW_CONSOLE = 0
+	FB_MODEVIEW_GUI
+end enum
 
-const FB_DEFAULT_MODEVIEW   =  FB_MODEVIEW_ISCONSOLE		 '***** console/gui
+const FB_DEFAULT_MODEVIEW   =  FB_MODEVIEW_CONSOLE
 
 '' pedantic checks
 enum FB_PDCHECK
@@ -273,7 +273,7 @@ type FBCMMLINEOPT
 	stacksize       as integer
 	objinfo         as integer
 	showincludes    as integer
-	modeview        as FB_MODEVIEW 
+	modeview        as FB_MODEVIEW
 end type
 
 '' features allowed in the selected language

src/compiler/fbc.bas

@@ -924,7 +924,7 @@ private function hLinkFiles( ) as integer
 		ldcline += hFindLib( "crtend.o" )
 
 	end select
-	
+
 	if( fbGetOption( FB_COMPOPT_TARGET ) = FB_COMPTARGET_DARWIN ) then
 		ldcline += " -macosx_version_min 10.6"
 	end if
@@ -1755,9 +1755,9 @@ private sub handleOpt(byval optid as integer, byref arg as string)
 
 	case OPT_S
 		fbc.subsystem = arg
-		select case( arg )                                                             '***** console/gui
-      			case "gui" : fbSetOption( FB_COMPOPT_MODEVIEW, FB_MODEVIEW_ISGUI )     '***** console/gui
-      		end select
+		select case( arg )
+      		case "gui" : fbSetOption( FB_COMPOPT_MODEVIEW, FB_MODEVIEW_GUI )
+      	end select
 
 	case OPT_SHOWINCLUDES
 		fbSetOption( FB_COMPOPT_SHOWINCLUDES, TRUE )
@@ -3206,7 +3206,7 @@ private sub hAddDefaultLibs( )
 			    defined(__FB_NETBSD__)
 				fbcAddDefLibPath( "/usr/X11R6/lib" )
 			#endif
-			
+
 			#if defined(__FB_DARWIN__) and defined(ENABLE_XQUARTZ)
 				fbcAddDefLibPAth( "/opt/X11/lib" )
 			#endif

src/compiler/symb-define.bas

@@ -85,11 +85,11 @@ end function
 private function hDefOptGosub_cb ( ) as string
 	function = str( env.opt.gosub = TRUE )
 end function
-															
-private function hDefViewGui_cb ( ) as string            '***** console/gui
-	function = str( env.clopt.modeview = FB_MODEVIEW_ISGUI )
+
+private function hDefGui_cb ( ) as string
+	function = str( env.clopt.modeview = FB_MODEVIEW_GUI )
 end function
-																
+
 private function hDefOutExe_cb ( ) as string
 	function = str( env.clopt.outtype = FB_OUTTYPE_EXECUTABLE )
 end function
@@ -213,7 +213,7 @@ dim shared defTb(0 to ...) as SYMBDEF => _
 	(@"__FB_FPU__"            , NULL          , FB_DEFINE_FLAGS_STR, @hDefFpu_cb        ), _
 	(@"__FB_FPMODE__"         , NULL          , FB_DEFINE_FLAGS_STR, @hDefFpmode_cb     ), _
 	(@"__FB_GCC__"            , NULL          , 0                  , @hDefGcc_cb        ), _
-	(@"__FB_GUI__"            , NULL          , 0                  , @hDefViewGui_cb    )  _  '***** console/gui
+	(@"__FB_GUI__"            , NULL          , 0                  , @hDefGui_cb    )  _
 }
 
 sub symbDefineInit _