use margin width after updating it in OnMeasureItem() (see #10452)

[wxWidgets.git] / src / cocoa / msgdlg.mm

diff --git a/src/cocoa/msgdlg.mm b/src/cocoa/msgdlg.mm
index fbe1e7bbcaf4cdd1d5482f3f5909a2431cc0c0ac..3dfe3f0a15e4f5ab32d7f1d51ed75dfd55afc9ae 100644 (file)
--- a/src/cocoa/msgdlg.mm
+++ b/src/cocoa/msgdlg.mm
@@ -44,16 +44,13 @@ IMPLEMENT_CLASS(wxCocoaMessageDialog, wxDialog)
 // ----------------------------------------------------------------------------
 
 wxCocoaMessageDialog::wxCocoaMessageDialog(wxWindow *parent,
 // ----------------------------------------------------------------------------
 
 wxCocoaMessageDialog::wxCocoaMessageDialog(wxWindow *parent,

-                        const wxString& message,
-                        const wxString& caption,
-                        long style,
-                        const wxPoint& pos) : wxMessageDialogBase(parent,message,caption,style)
+                                           const wxString& message,
+                                           const wxString& caption,
+                                           long style,
+                                           const wxPoint& pos)
+    : wxMessageDialogWithCustomLabels(parent, message, caption, style)

 {
 
 {
 

-    //m_caption = caption;
-    //m_message = message;
-
-    //wxTopLevelWindows.Append((wxWindowBase*)this);

     wxTopLevelWindows.Append(this);
 
     wxASSERT(CreateBase(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,style,wxDefaultValidator,wxDialogNameStr));
     wxTopLevelWindows.Append(this);
 
     wxASSERT(CreateBase(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,style,wxDefaultValidator,wxDialogNameStr));


@@ -64,16 +61,13 @@ wxCocoaMessageDialog::wxCocoaMessageDialog(wxWindow *parent,
 
     m_cocoaNSWindow = nil;
     m_cocoaNSView = nil;
 
     m_cocoaNSWindow = nil;
     m_cocoaNSView = nil;

-
-    m_yes = _("Yes");
-    m_no  = _("No");
-    m_ok  = _("OK");
-    m_cancel = _("Cancel");
-

 }
 
 }
 

-wxCocoaMessageDialog::~wxCocoaMessageDialog()
+void wxCocoaMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& value)

 {
 {

+    wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, value);
+
+    var.Replace("&", "");

 }
 
 int wxCocoaMessageDialog::ShowModal()
 }
 
 int wxCocoaMessageDialog::ShowModal()


@@ -121,21 +115,21 @@ int wxCocoaMessageDialog::ShowModal()
     {
         if ( style & wxNO_DEFAULT )
         {
     {
         if ( style & wxNO_DEFAULT )
         {

-            [alert addButtonWithTitle:wxNSStringWithWxString(m_no)];
-            [alert addButtonWithTitle:wxNSStringWithWxString(m_yes)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(GetNoLabel())];
+            [alert addButtonWithTitle:wxNSStringWithWxString(GetYesLabel())];

             buttonId[0] = wxID_NO;
             buttonId[1] = wxID_YES;
         }
         else
         {
             buttonId[0] = wxID_NO;
             buttonId[1] = wxID_YES;
         }
         else
         {

-            [alert addButtonWithTitle:wxNSStringWithWxString(m_yes)];
-            [alert addButtonWithTitle:wxNSStringWithWxString(m_no)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(GetYesLabel())];
+            [alert addButtonWithTitle:wxNSStringWithWxString(GetNoLabel())];

             buttonId[0] = wxID_YES;
             buttonId[1] = wxID_NO;
         }
         if (style & wxCANCEL)
         {
             buttonId[0] = wxID_YES;
             buttonId[1] = wxID_NO;
         }
         if (style & wxCANCEL)
         {

-            [alert addButtonWithTitle:wxNSStringWithWxString(m_cancel)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(GetCancelLabel())];

             buttonId[2] = wxID_CANCEL;
         }
     }
             buttonId[2] = wxID_CANCEL;
         }
     }


@@ -144,10 +138,10 @@ int wxCocoaMessageDialog::ShowModal()
         // the MSW implementation even shows an OK button if it is not specified, we'll do the same
         buttonId[0] = wxID_OK;
         // using null as default title does not work on earlier systems
         // the MSW implementation even shows an OK button if it is not specified, we'll do the same
         buttonId[0] = wxID_OK;
         // using null as default title does not work on earlier systems

-        [alert addButtonWithTitle:wxNSStringWithWxString(m_ok)];
+        [alert addButtonWithTitle:wxNSStringWithWxString(GetOKLabel())];

         if (style & wxCANCEL)
         {
         if (style & wxCANCEL)
         {

-            [alert addButtonWithTitle:wxNSStringWithWxString(m_cancel)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(GetCancelLabel())];

             buttonId[1] = wxID_CANCEL;
         }
     }
             buttonId[1] = wxID_CANCEL;
         }
     }


@@ -158,38 +152,5 @@ int wxCocoaMessageDialog::ShowModal()
     return buttonId[ret-NSAlertFirstButtonReturn];
 }
 
     return buttonId[ret-NSAlertFirstButtonReturn];
 }
 

-bool wxCocoaMessageDialog::SetYesNoLabels(const wxString& yes,const wxString& no)
-{
-    m_yes = yes;
-    m_yes.Replace(_("&"),_(""));
-    m_no = no;
-    m_no.Replace(_("&"),_(""));
-    return true;
-}
-bool wxCocoaMessageDialog::SetYesNoCancelLabels(const wxString& yes, const wxString& no, const wxString& cancel)
-{
-    m_yes = yes;
-    m_yes.Replace(_("&"),_(""));
-    m_no = no;
-    m_no.Replace(_("&"),_(""));
-    m_cancel = cancel;
-    m_cancel.Replace(_("&"),_(""));
-    return true;
-}
-bool wxCocoaMessageDialog::SetOKLabel(const wxString& ok)
-{
-    m_ok = ok;
-    m_ok.Replace(_("&"),_(""));
-    return true;
-}
-bool wxCocoaMessageDialog::SetOKCancelLabels(const wxString& ok, const wxString& cancel)
-{
-    m_ok = ok;
-    m_ok.Replace(_("&"),_(""));
-    m_cancel = cancel;
-    m_cancel.Replace(_("&"),_(""));
-    return true;
-}
-

 #endif // wxUSE_DIRDLG
 
 #endif // wxUSE_DIRDLG