Add missing WXK constants for the control keys

[wxWidgets.git] / src / osx / carbon / fontdlg.cpp

diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index bfc19e1386527f78abf3d6c75233fd9cdc358bb9..8290b53910ecae1953d4f87db69962d8db8023eb 100644 (file)
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/fontdlg.cpp
+// Name:        src/osx/carbon/fontdlg.cpp

 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:


@@ -41,17 +41,20 @@
 #endif
 
 #include "wx/fontdlg.h"
 #endif
 
 #include "wx/fontdlg.h"

+#include "wx/fontutil.h"

 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 

-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"

 
 // ---------------------------------------------------------------------------
 // wxFontDialog
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxFontDialog
 // ---------------------------------------------------------------------------
 

+#if wxOSX_USE_CARBON
+

 static const EventTypeSpec eventList[] =
 {
     { kEventClassFont, kEventFontSelection } ,
 static const EventTypeSpec eventList[] =
 {
     { kEventClassFont, kEventFontSelection } ,


@@ -80,7 +83,9 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
                 if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
                 {
                     wxFont font;
                 if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
                 {
                     wxFont font;

-                    font.MacCreateFromCTFontDescriptor(descr);
+                    wxNativeFontInfo fontinfo;
+                    fontinfo.Init(descr);
+                    font.Create(fontinfo);

                     fontdata.SetChosenFont( font ) ;
                     setup = true;
                 }
                     fontdata.SetChosenFont( font ) ;
                     setup = true;
                 }


@@ -98,7 +103,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
                 FMFontFamily fontFamily = cEvent.GetParameter<FMFontFamily>(kEventParamFMFontFamily);
                 ATSFontFamilyRef atsfontfamilyref = FMGetATSFontFamilyRefFromFontFamily( fontFamily ) ;
                 OSStatus err = ATSFontFamilyGetName( atsfontfamilyref , kATSOptionFlagsDefault , &cfName ) ;
                 FMFontFamily fontFamily = cEvent.GetParameter<FMFontFamily>(kEventParamFMFontFamily);
                 ATSFontFamilyRef atsfontfamilyref = FMGetATSFontFamilyRefFromFontFamily( fontFamily ) ;
                 OSStatus err = ATSFontFamilyGetName( atsfontfamilyref , kATSOptionFlagsDefault , &cfName ) ;

-                if ( err == noErr )
+                if ( err != noErr )

                 {
                     wxFAIL_MSG("ATSFontFamilyGetName failed");
                 }
                 {
                     wxFAIL_MSG("ATSFontFamilyGetName failed");
                 }


@@ -191,11 +196,17 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacCarbonFontPanelHandler )
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacCarbonFontPanelHandler )

+#endif

 
 wxFontDialog::wxFontDialog()
 {
 }
 
 
 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);


@@ -205,17 +216,24 @@ wxFontDialog::~wxFontDialog()
 {
 }
 
 {
 }
 

-bool wxFontDialog::Create(wxWindow *WXUNUSED(parent), const wxFontData& data)
+bool wxFontDialog::Create(wxWindow *WXUNUSED(parent))

 {
 {

-    m_fontData = data;

     return true ;
 }
 
     return true ;
 }
 

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

 int wxFontDialog::ShowModal()
 {
 int wxFontDialog::ShowModal()
 {

+#if wxOSX_USE_CARBON
+

     OSStatus err ;
     wxFont font = *wxNORMAL_FONT ;
     OSStatus err ;
     wxFont font = *wxNORMAL_FONT ;

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

     {
         font = m_fontData.m_initialFont ;
     }
     {
         font = m_fontData.m_initialFont ;
     }


@@ -224,8 +242,9 @@ int wxFontDialog::ShowModal()
 #if wxOSX_USE_CORE_TEXT
     if ( UMAGetSystemVersion() >= 0x1050 )
     {
 #if wxOSX_USE_CORE_TEXT
     if ( UMAGetSystemVersion() >= 0x1050 )
     {

-        CTFontDescriptorRef descr = (CTFontDescriptorRef)font.MacGetCTFontDescriptor();
+        CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() );

         err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);
         err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);

+        CFRelease( descr );

         setup = true;
     }
 #endif
         setup = true;
     }
 #endif


@@ -247,10 +266,13 @@ int wxFontDialog::ShowModal()
 
     if ( !FPIsFontPanelVisible() )
         FPShowHideFontPanel();
 
     if ( !FPIsFontPanelVisible() )
         FPShowHideFontPanel();

-
+#endif
+    wxDialog::OSXBeginModalDialog();

     int retval = RunMixedFontDialog(this);
     int retval = RunMixedFontDialog(this);

-
+    wxDialog::OSXEndModalDialog();
+#if wxOSX_USE_CARBON

     ::RemoveEventHandler(handler);
     ::RemoveEventHandler(handler);

+#endif

 
     return retval ;
 }
 
     return retval ;
 }


@@ -304,7 +326,7 @@ void wxFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     wxSize size = GetSize();
     wxFont font = GetFont();
 
     wxSize size = GetSize();
     wxFont font = GetFont();
 

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

     {
         dc.SetFont(font);
         // Calculate vertical centre
     {
         dc.SetFont(font);
         // Calculate vertical centre


@@ -492,7 +514,7 @@ void wxFontDialog::CreateControls()
     itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL);
     itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL);

-    itemFlexGridSizer4->Add(itemBoxSizer6, 0, wxGROW|wxGROW, 5);
+    itemFlexGridSizer4->Add(itemBoxSizer6, 0, wxGROW, 5);

 
     wxString* m_facenameCtrlStrings = NULL;
     m_facenameCtrl = new wxListBox( itemDialog1, wxID_FONTDIALOG_FACENAME, wxDefaultPosition, wxSize(320, 100), 0, m_facenameCtrlStrings, wxLB_SINGLE );
 
     wxString* m_facenameCtrlStrings = NULL;
     m_facenameCtrl = new wxListBox( itemDialog1, wxID_FONTDIALOG_FACENAME, wxDefaultPosition, wxSize(320, 100), 0, m_facenameCtrlStrings, wxLB_SINGLE );


@@ -501,7 +523,7 @@ void wxFontDialog::CreateControls()
     wxStaticText* itemStaticText8 = new wxStaticText( itemDialog1, wxID_STATIC, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFlexGridSizer4->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxStaticText* itemStaticText8 = new wxStaticText( itemDialog1, wxID_STATIC, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFlexGridSizer4->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

-    m_sizeCtrl = new wxSpinCtrl( itemDialog1, wxID_FONTDIALOG_FONTSIZE, _T("12"), wxDefaultPosition, wxSize(60, -1), wxSP_ARROW_KEYS, 1, 300, 12 );
+    m_sizeCtrl = new wxSpinCtrl( itemDialog1, wxID_FONTDIALOG_FONTSIZE, wxT("12"), wxDefaultPosition, wxSize(60, -1), wxSP_ARROW_KEYS, 1, 300, 12 );

     m_sizeCtrl->SetHelpText(_("The font size in points."));
     if (ShowToolTips())
         m_sizeCtrl->SetToolTip(_("The font size in points."));
     m_sizeCtrl->SetHelpText(_("The font size in points."));
     if (ShowToolTips())
         m_sizeCtrl->SetToolTip(_("The font size in points."));


@@ -577,7 +599,7 @@ void wxFontDialog::CreateControls()
     wxFontEnumerator enumerator;
     enumerator.EnumerateFacenames();
     wxArrayString facenames = enumerator.GetFacenames();
     wxFontEnumerator enumerator;
     enumerator.EnumerateFacenames();
     wxArrayString facenames = enumerator.GetFacenames();

-    if (facenames)
+    if (!facenames.empty())

     {
         facenames.Add(_("<Any>"));
         facenames.Add(_("<Any Roman>"));
     {
         facenames.Add(_("<Any>"));
         facenames.Add(_("<Any Roman>"));


@@ -592,7 +614,7 @@ void wxFontDialog::CreateControls()
 
     InitializeControls();
     m_previewCtrl->SetFont(m_dialogFont);
 
     InitializeControls();
     m_previewCtrl->SetFont(m_dialogFont);

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

     {
         m_previewCtrl->SetForegroundColour(m_fontData.GetColour());
     }
     {
         m_previewCtrl->SetForegroundColour(m_fontData.GetColour());
     }


@@ -688,7 +710,7 @@ void wxFontDialog::InitializeFont()
     bool fontUnderline = false;
     wxString fontName;
 
     bool fontUnderline = false;
     wxString fontName;
 

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

     {
         fontFamily = m_fontData.m_initialFont.GetFamily();
         fontWeight = m_fontData.m_initialFont.GetWeight();
     {
         fontFamily = m_fontData.m_initialFont.GetFamily();
         fontWeight = m_fontData.m_initialFont.GetWeight();


@@ -726,7 +748,7 @@ void wxFontDialog::InitializeControls()
     }
     m_facenameCtrl->SetStringSelection(facename);
 
     }
     m_facenameCtrl->SetStringSelection(facename);
 

-    if (m_colourCtrl && m_fontData.GetColour().Ok())
+    if (m_colourCtrl && m_fontData.GetColour().IsOk())

     {
         m_colourCtrl->SetColour(m_fontData.GetColour());
         m_colourCtrl->Refresh();
     {
         m_colourCtrl->SetColour(m_fontData.GetColour());
         m_colourCtrl->Refresh();