reverted to TCL version of regex library

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index c68e9596edefb8273b219069ed17089b19a25ecf..6e7603190b036c6043c1cbd10e76e0cc02333045 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -32,10 +32,10 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator, const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
             const wxValidator& validator, const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;

-    wxLogDebug(wxT("Creating control with id=%d"),winid);
+    wxLogTrace(wxTRACE_COCOA,wxT("Creating control with id=%d"),winid);

     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;

-    wxLogDebug(wxT("Created control with id=%d"),GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());

     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).
     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).


@@ -60,7 +60,7 @@ wxButton::~wxButton()
 
 void wxButton::Cocoa_wxNSButtonAction(void)
 {
 
 void wxButton::Cocoa_wxNSButtonAction(void)
 {

-    wxLogDebug(wxT("YAY!"));
+    wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);


@@ -68,7 +68,7 @@ void wxButton::Cocoa_wxNSButtonAction(void)
 
 wxString wxButton::GetLabel() const
 {
 
 wxString wxButton::GetLabel() const
 {

-    return wxString([[GetNSButton() title] lossyCString]);
+    return wxStringWithNSString([GetNSButton() title]);

 }
 
 void wxButton::SetLabel(const wxString& label)
 }
 
 void wxButton::SetLabel(const wxString& label)