Add missing WXK constants for the control keys

[wxWidgets.git] / src / osx / carbon / fontdlgosx.mm

diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index bb8f35642a10e0fa5c7d1281ccf70379a25b8205..6c2ab56c81a3e5a25b92f3c9e1c117ece1a26267 100644 (file)
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/fontdlgosx.cpp
+// Name:        src/osx/carbon/fontdlgosx.mm

 // Purpose:     wxFontDialog class.
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     wxFontDialog class.
 // Author:      Ryan Norton
 // Modified by:


@@ -167,6 +167,7 @@ int RunMixedFontDialog(wxFontDialog* dialog)
         NSRect rectBox = NSMakeRect( 0 , 0 , 192 , 40 );
         accessoryView = [[wxMacFontPanelAccView alloc] initWithFrame:rectBox];
         [fontPanel setAccessoryView:accessoryView];
         NSRect rectBox = NSMakeRect( 0 , 0 , 192 , 40 );
         accessoryView = [[wxMacFontPanelAccView alloc] initWithFrame:rectBox];
         [fontPanel setAccessoryView:accessoryView];

+        [accessoryView release];

 
         [fontPanel setDefaultButtonCell:[[accessoryView okButton] cell]] ;
     }
 
         [fontPanel setDefaultButtonCell:[[accessoryView okButton] cell]] ;
     }


@@ -174,14 +175,14 @@ int RunMixedFontDialog(wxFontDialog* dialog)
     [accessoryView resetFlags];
 #if wxOSX_USE_COCOA
     wxFont font = *wxNORMAL_FONT ;
     [accessoryView resetFlags];
 #if wxOSX_USE_COCOA
     wxFont font = *wxNORMAL_FONT ;

-    if ( fontdata.m_initialFont.Ok() )
+    if ( fontdata.m_initialFont.IsOk() )

     {
         font = fontdata.m_initialFont ;
     }
 
     [[NSFontPanel sharedFontPanel] setPanelFont: font.OSXGetNSFont() isMultiple:NO];
 
     {
         font = fontdata.m_initialFont ;
     }
 
     [[NSFontPanel sharedFontPanel] setPanelFont: font.OSXGetNSFont() isMultiple:NO];
 

-    if(fontdata.m_fontColour.Ok())
+    if(fontdata.m_fontColour.IsOk())

         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:fontdata.m_fontColour.Red() / 255.0
                                         green:fontdata.m_fontColour.Green() / 255.0
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:fontdata.m_fontColour.Red() / 255.0
                                         green:fontdata.m_fontColour.Green() / 255.0


@@ -220,7 +221,6 @@ int RunMixedFontDialog(wxFontDialog* dialog)
         retval = wxID_OK ;
     }
     [fontPanel setAccessoryView:nil];
         retval = wxID_OK ;
     }
     [fontPanel setAccessoryView:nil];

-    [accessoryView release];

 
     return retval ;
 }
 
     return retval ;
 }


@@ -351,6 +351,11 @@ wxFontDialog::wxFontDialog()
 {
 }
 
 {
 }
 

+wxFontDialog::wxFontDialog(wxWindow *parent)
+{
+    Create(parent);
+}
+

 wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);
 wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);


@@ -360,10 +365,20 @@ wxFontDialog::~wxFontDialog()
 {
 }
 
 {
 }
 

+bool wxFontDialog::Create(wxWindow *parent)
+{
+    return Create(parent);
+}
+

 bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
     m_fontData = data;
 
 bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
     m_fontData = data;
 

+    return Create(parent);
+}
+
+bool wxFontDialog::Create(wxWindow *parent)
+{

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


@@ -373,7 +388,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 
     //if the font is valid set the default (selected) font of the
     //NSFontDialog to that font
 
     //if the font is valid set the default (selected) font of the
     //NSFontDialog to that font

-    if (thewxfont.Ok())
+    if (thewxfont.IsOk())

     {
         NSFontTraitMask theMask = 0;
 
     {
         NSFontTraitMask theMask = 0;
 


@@ -401,7 +416,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 
     }
 
 
     }
 

-    if(m_fontData.m_fontColour.Ok())
+    if(m_fontData.m_fontColour.IsOk())

         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:m_fontData.m_fontColour.Red() / 255.0
                                         green:m_fontData.m_fontColour.Green() / 255.0
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:m_fontData.m_fontColour.Red() / 255.0
                                         green:m_fontData.m_fontColour.Green() / 255.0


@@ -453,6 +468,7 @@ int wxFontDialog::ShowModal()
     //  the color panel until the color panel closes, switching
     //  back to the font panel modal loop once it does close.
     //
     //  the color panel until the color panel closes, switching
     //  back to the font panel modal loop once it does close.
     //

+    wxDialog::OSXBeginModalDialog();

     do
     {
         //
     do
     {
         //


@@ -491,7 +507,8 @@ int wxFontDialog::ShowModal()
         //out of its modal loop because the color panel was
         //opened) return the font panel modal loop
     }while([theFPDelegate isClosed] == NO);
         //out of its modal loop because the color panel was
         //opened) return the font panel modal loop
     }while([theFPDelegate isClosed] == NO);

-
+    wxDialog::OSXEndModalDialog();
+    

     //free up the memory for the delegates - we don't need them anymore
     [theFPDelegate release];
     [theCPDelegate release];
     //free up the memory for the delegates - we don't need them anymore
     [theFPDelegate release];
     [theCPDelegate release];