fixing memory leak and unnecessary cocoa init, refs #10856

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index 0dc098887ff7a811c11fb1c36ee03765e0a4581d..f1093c4391e6c9f0fc1b519ff37164033644ee3d 100644 (file)
--- a/src/osx/carbon/colordlgosx.mm
+++ b/src/osx/carbon/colordlgosx.mm
@@ -106,18 +106,6 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if (data)
         m_colourData = *data;
 
     if (data)
         m_colourData = *data;
 

-    //
-    // This is the key call - this initializes
-    // events and window stuff for cocoa for carbon
-    // applications.
-    //
-    // This is also the only call here that is
-    // 10.2+ specific (the rest is OSX only),
-    // which, ironically, the carbon font
-    // panel requires.
-    //
-    bool bOK = NSApplicationLoad();
-

     //autorelease pool - req'd for carbon
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];
     //autorelease pool - req'd for carbon
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];


@@ -135,7 +123,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     //We're done - free up the pool
     [thePool release];
 
     //We're done - free up the pool
     [thePool release];
 

-    return bOK;
+    return true;

 }
 int wxColourDialog::ShowModal()
 {
 }
 int wxColourDialog::ShowModal()
 {


@@ -170,6 +158,7 @@ int wxColourDialog::ShowModal()
             [NSApp endModalSession:session];
 
     //free up the memory for the delegates - we don't need them anymore
             [NSApp endModalSession:session];
 
     //free up the memory for the delegates - we don't need them anymore

+    [theColorPanel setDelegate:nil];

     [theCPDelegate release];
 
     //Get the shared color panel along with the chosen color and set the chosen color
     [theCPDelegate release];
 
     //Get the shared color panel along with the chosen color and set the chosen color