Add RCS-ID and normalize whitespace

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

include/wx/cocoa/msgdlg.h

@@ -3,6 +3,7 @@
 // Purpose:     wxMessageDialog class
 // Author:      Gareth Simpson
 // Created:     2007-10-29
+// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -51,9 +52,9 @@ public:
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
-	virtual ~wxCocoaMessageDialog();
+    virtual ~wxCocoaMessageDialog();
 
-	virtual int ShowModal();
+    virtual int ShowModal();
 
     // customization of the message box
     virtual bool SetYesNoLabels(const wxString& yes,const wxString& no);
@@ -72,10 +73,10 @@ protected:
              m_extendedMessage,
              m_caption;
 private:
-	wxString m_yes,
+    wxString m_yes,
-			 m_no,
+             m_no,
-			 m_ok,
+             m_ok,
-			 m_cancel;
+             m_cancel;
 
 };
 

src/cocoa/msgdlg.mm

@@ -3,6 +3,7 @@
 // Purpose:     wxMessageDialog for wxCocoa
 // Author:      Gareth Simpson
 // Created:     2007-10-09
+// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -46,14 +47,14 @@ wxCocoaMessageDialog::wxCocoaMessageDialog(wxWindow *parent,
                         const wxString& message,
                         const wxString& caption,
                         long style,
-						const wxPoint& pos) : wxDialog(parent,message,caption,style)
+                        const wxPoint& pos) : wxDialog(parent,message,caption,style)
 {
 
-	//m_caption = caption;
+    //m_caption = caption;
-	//m_message = message;
+    //m_message = message;
 
     //wxTopLevelWindows.Append((wxWindowBase*)this);
-	wxTopLevelWindows.Append(this);
+    wxTopLevelWindows.Append(this);
 
     wxASSERT(CreateBase(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,style,wxDefaultValidator,wxDialogNameStr));
 
@@ -77,9 +78,9 @@ wxCocoaMessageDialog::~wxCocoaMessageDialog()
 
 int wxCocoaMessageDialog::ShowModal()
 {
-	wxAutoNSAutoreleasePool thePool;
+    wxAutoNSAutoreleasePool thePool;
 
-	NSAlert *alert = [[[NSAlert alloc] init] autorelease];
+    NSAlert *alert = [[[NSAlert alloc] init] autorelease];
 
     const long style = GetMessageDialogStyle();
 
@@ -93,7 +94,7 @@ int wxCocoaMessageDialog::ShowModal()
     else if (style & wxICON_QUESTION)
         nsStyle = NSInformationalAlertStyle;
 
-	[alert setAlertStyle:nsStyle];
+    [alert setAlertStyle:nsStyle];
 
 
 
@@ -103,91 +104,91 @@ int wxCocoaMessageDialog::ShowModal()
     // and the message as the text (for backwards compatibility)
     // but if the extended message is not empty then we use the message as the title
     // and the extended message as the text because that makes more sense
-	if (m_extendedMessage.empty())
+    if (m_extendedMessage.empty())
-	{
+    {
-		[alert setMessageText:wxNSStringWithWxString(m_caption)];
+        [alert setMessageText:wxNSStringWithWxString(m_caption)];
-		[alert setInformativeText:wxNSStringWithWxString(m_message)];
+        [alert setInformativeText:wxNSStringWithWxString(m_message)];
-	}
+    }
-	else
+    else
-	{
+    {
-		[alert setMessageText:wxNSStringWithWxString(m_message)];
+        [alert setMessageText:wxNSStringWithWxString(m_message)];
-		[alert setInformativeText:wxNSStringWithWxString(m_extendedMessage)];	
+        [alert setInformativeText:wxNSStringWithWxString(m_extendedMessage)];
-	}
+    }
 
-	//	The wxReturn value corresponding to each button
+    //    The wxReturn value corresponding to each button
-	int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ };
+    int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ };
-	if (style & wxYES_NO)
+    if (style & wxYES_NO)
-	{
+    {
-		if ( style & wxNO_DEFAULT )
+        if ( style & wxNO_DEFAULT )
-		{
+        {
-			[alert addButtonWithTitle:wxNSStringWithWxString(m_no)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(m_no)];
-			[alert addButtonWithTitle:wxNSStringWithWxString(m_yes)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(m_yes)];
-			buttonId[0] = wxID_NO;
+            buttonId[0] = wxID_NO;
-			buttonId[1] = wxID_YES;
+            buttonId[1] = wxID_YES;
-		}
+        }
-		else
+        else
-		{
+        {
-			[alert addButtonWithTitle:wxNSStringWithWxString(m_yes)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(m_yes)];
-			[alert addButtonWithTitle:wxNSStringWithWxString(m_no)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(m_no)];
-			buttonId[0] = wxID_YES;
+            buttonId[0] = wxID_YES;
-			buttonId[1] = wxID_NO;
+            buttonId[1] = wxID_NO;
-		}
+        }
-		if (style & wxCANCEL)
+        if (style & wxCANCEL)
-		{
+        {
-			[alert addButtonWithTitle:wxNSStringWithWxString(m_cancel)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(m_cancel)];
-			buttonId[2] = wxID_CANCEL;
+            buttonId[2] = wxID_CANCEL;
-		}
+        }
-	}
+    }
-	else
+    else
-	{
+    {
-		// the MSW implementation even shows an OK button if it is not specified, we'll do the same
+        // the MSW implementation even shows an OK button if it is not specified, we'll do the same
-		buttonId[0] = wxID_OK;
+        buttonId[0] = wxID_OK;
-		// using null as default title does not work on earlier systems
+        // using null as default title does not work on earlier systems
-		[alert addButtonWithTitle:wxNSStringWithWxString(m_ok)];
+        [alert addButtonWithTitle:wxNSStringWithWxString(m_ok)];
-		if (style & wxCANCEL)
+        if (style & wxCANCEL)
-		{
+        {
-			[alert addButtonWithTitle:wxNSStringWithWxString(m_cancel)];
+            [alert addButtonWithTitle:wxNSStringWithWxString(m_cancel)];
-			buttonId[1] = wxID_CANCEL;
+            buttonId[1] = wxID_CANCEL;
-		}
+        }
-	}
+    }
 
-	int ret = [alert runModal];
+    int ret = [alert runModal];
 
 
-	return buttonId[ret-NSAlertFirstButtonReturn];
+    return buttonId[ret-NSAlertFirstButtonReturn];
 }
 
 bool wxCocoaMessageDialog::SetYesNoLabels(const wxString& yes,const wxString& no)
 {
-	m_yes = yes;
+    m_yes = yes;
-	m_yes.Replace(_("&"),_(""));
+    m_yes.Replace(_("&"),_(""));
-	m_no = no;
+    m_no = no;
-	m_no.Replace(_("&"),_(""));
+    m_no.Replace(_("&"),_(""));
-	return true;
+    return true;
 }
 bool wxCocoaMessageDialog::SetYesNoCancelLabels(const wxString& yes, const wxString& no, const wxString& cancel)
 {
-	m_yes = yes;
+    m_yes = yes;
-	m_yes.Replace(_("&"),_(""));
+    m_yes.Replace(_("&"),_(""));
-	m_no = no;
+    m_no = no;
-	m_no.Replace(_("&"),_(""));
+    m_no.Replace(_("&"),_(""));
-	m_cancel = cancel;
+    m_cancel = cancel;
-	m_cancel.Replace(_("&"),_(""));
+    m_cancel.Replace(_("&"),_(""));
-	return true;
+    return true;
 }
 bool wxCocoaMessageDialog::SetOKLabel(const wxString& ok)
 {
-	m_ok = ok;
+    m_ok = ok;
-	m_ok.Replace(_("&"),_(""));
+    m_ok.Replace(_("&"),_(""));
-	return true;
+    return true;
 }
 bool wxCocoaMessageDialog::SetOKCancelLabels(const wxString& ok, const wxString& cancel)
 {
-	m_ok = ok;
+    m_ok = ok;
-	m_ok.Replace(_("&"),_(""));
+    m_ok.Replace(_("&"),_(""));
-	m_cancel = cancel;
+    m_cancel = cancel;
-	m_cancel.Replace(_("&"),_(""));
+    m_cancel.Replace(_("&"),_(""));
-	return true;
+    return true;
 }
 
 #endif // wxUSE_DIRDLG