X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4c1fab95553e947c9f910469a440b6150475ac6..a9152a05f8132181caa920309fba63c3784f8c71:/src/mac/carbon/textctrl.cpp?ds=sidebyside

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index ddd40ad9d5..f522366b32 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -624,10 +624,10 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 	    	
 	    	for (int j = i; j < actualsize; j++)
 	    	{
-	    	    tmp += wxBuffer[j];
-	    	    
 	    	    if (wxBuffer[j] == '\r')
 	    	        return tmp;
+	    	        
+	    	    tmp += wxBuffer[j];
 	    	}
 	    	
 	    	return tmp;
@@ -680,12 +680,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     			}
            		if ( panel && panel->GetDefaultItem() )
            		{
-           			wxButton *def = panel->GetDefaultItem() ;
-    				wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-   					event.SetEventObject(def);
-   					def->Command(event);
-               		event.Skip() ;
-                	return ;
+                    wxButton *def = wxDynamicCast(panel->GetDefaultItem(),
+                                                          wxButton);
+           			if ( def && def->IsEnabled() )
+           			{
+    				    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+   					    event.SetEventObject(def);
+   					    def->Command(event);
+                    	return ;
+                   }
            		}
             }
             //else: multiline controls need Enter for themselves