added wxTextCtrl::HitTest(); implemented it for MSW

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

diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm
index 29e001cadff9492800181b3c95ea374b96be322a..5ceef75f9911f50d33225404bd875d1496a90346 100644 (file)
--- a/src/cocoa/radiobut.mm
+++ b/src/cocoa/radiobut.mm
@@ -9,9 +9,12 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
-#include "wx/radiobut.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/radiobut.h"
+#endif //WX_PRECOMP

 
 #import <AppKit/NSButton.h>
 #include "wx/cocoa/string.h"
 
 #import <AppKit/NSButton.h>
 #include "wx/cocoa/string.h"


@@ -57,7 +60,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
             {
                 m_radioMaster = radioButton->m_radioMaster;
                 wxASSERT_MSG(m_radioMaster,
             {
                 m_radioMaster = radioButton->m_radioMaster;
                 wxASSERT_MSG(m_radioMaster,

-                    "Previous radio button should be part of a group");
+                    wxT("Previous radio button should be part of a group"));

                 // Don't crash, assume user meant wxRB_SINGLE
                 if(m_radioMaster)
                     m_radioMaster->m_radioSlaves.Append(this);
                 // Don't crash, assume user meant wxRB_SINGLE
                 if(m_radioMaster)
                     m_radioMaster->m_radioSlaves.Append(this);


@@ -117,7 +120,7 @@ wxRadioButton::~wxRadioButton()
         m_radioMaster = NULL;
     }
     // normal stuff
         m_radioMaster = NULL;
     }
     // normal stuff

-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());

 }
 
 void wxRadioButton::SetValue(bool value)
 }
 
 void wxRadioButton::SetValue(bool value)


@@ -137,7 +140,7 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {

-    wxLogDebug("wxRadioButton");
+    wxLogDebug(wxT("wxRadioButton"));

     if(m_radioMaster && ([GetNSButton() state] == NSOnState))
     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =
     if(m_radioMaster && ([GetNSButton() state] == NSOnState))
     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =