cocoa: Makes the native modal mode selective via a define

git-svn-id: trunk@49779 -

.gitattributes

@@ -6965,6 +6965,7 @@ lcl/interfaces/cocoa/Makefile.fpc svneol=native#text/plain
 lcl/interfaces/cocoa/alllclintfunits.pas svneol=native#text/plain
 lcl/interfaces/cocoa/cocoa_extra.pas svneol=native#text/plain
 lcl/interfaces/cocoa/cocoacaret.pas svneol=native#text/pascal
+lcl/interfaces/cocoa/cocoadefines.inc svneol=native#text/plain
 lcl/interfaces/cocoa/cocoagdiobjects.pas svneol=native#text/plain
 lcl/interfaces/cocoa/cocoaint.pas svneol=native#text/plain
 lcl/interfaces/cocoa/cocoalclintf.inc svneol=native#text/pascal

lcl/interfaces/cocoa/cocoa_extra.pas

@@ -27,6 +27,10 @@ uses
   MacOSAll, CocoaAll;
 
 type
+  NSMenuFix = objccategory external (NSMenu)
+    function itemAtIndex(index: NSInteger): NSMenuItem; message 'itemAtIndex:';
+  end;
+
   NSViewFix = objccategory external (NSView)
     function fittingSize: NSSize; message 'fittingSize';
   end;

lcl/interfaces/cocoa/cocoadefines.inc

@@ -0,0 +1,4 @@
+{%MainUnit cocoaint.pas}
+
+{.$define COCOA_USE_NATIVE_MODAL}
+

lcl/interfaces/cocoa/cocoaint.pas

@@ -21,6 +21,7 @@ unit CocoaInt;
 {$mode objfpc}{$H+}
 {$modeswitch objectivec1}
 {$modeswitch objectivec2}
+{$include cocoadefines.inc}
 
 interface
 

lcl/interfaces/cocoa/cocoaobject.inc

@@ -229,9 +229,14 @@ begin
     lcNeedMininimizeAppWithMainForm,
     lcApplicationTitle,
     lcFormIcon,
+    {$ifndef COCOA_USE_NATIVE_MODAL}
+    lcModalWindow,
+    {$endif}
     lcReceivesLMClearCutCopyPasteReliably:
       Result := LCL_CAPABILITY_NO;
+    {$ifdef COCOA_USE_NATIVE_MODAL}
     lcModalWindow,
+    {$endif}
     lcAntialiasingEnabledByDefault:
       Result := LCL_CAPABILITY_YES;
   else

lcl/interfaces/cocoa/cocoawsforms.pp

@@ -18,6 +18,7 @@ unit CocoaWSForms;
 
 {$mode objfpc}{$H+}
 {$modeswitch objectivec1}
+{$include cocoadefines.inc}
 
 interface
 
@@ -567,7 +568,9 @@ begin
   {if CocoaWidgetSet.CurModalSession <> nil then
     NSApp.endModalSession(CocoaWidgetSet.CurModalSession);
   CocoaWidgetSet.CurModalSession := nil;}
-  NSApp.stopModal();
+ {$ifdef COCOA_USE_NATIVE_MODAL}
+ NSApp.stopModal();
+ {$endif}
   CocoaWidgetSet.CurModalForm := nil;
 end;
 
@@ -586,7 +589,9 @@ begin
   NSApp.runModalSession(CocoaWidgetSet.CurModalSession);}
 
   CocoaWidgetSet.CurModalForm := ACustomForm;
+  {$ifdef COCOA_USE_NATIVE_MODAL}
   NSApp.runModalForWindow(win);
+  {$endif}
 end;
 
 // If ShowModal will not be fully blocking in the future this can be removed