Fix another line somehow missing from the wxGraphicsBitmap forward port.

[wxWidgets.git] / src / osx / textctrl_osx.cpp

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index ae3328808aa9aa6fb609aac8148668cab16c6b6e..573fd4c6ae5973d05a15800230c4a1332fa8ebd4 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -720,8 +720,7 @@ void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }
 
-    if (m_privateContextMenu != NULL)
-        PopupMenu(m_privateContextMenu);
+    PopupMenu(m_privateContextMenu);
 #endif
 }
 
@@ -828,9 +827,8 @@ void wxTextWidgetImpl::ShowPosition( long WXUNUSED(pos) )
 
 int wxTextWidgetImpl::GetNumberOfLines() const
 {
-    ItemCount lines = 0 ;
     wxString content = GetStringValue() ;
-    lines = 1;
+    ItemCount lines = 1;
 
     for (size_t i = 0; i < content.length() ; i++)
     {