/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/textctrl.mm
+// Name: src/cocoa/textctrl.mm
// Purpose: wxTextCtrl
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWidgets licence
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#include "wx/textctrl.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/textctrl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include <math.h>
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
END_EVENT_TABLE()
WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
return 0;
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
return 0;
}
NSCell *cell = [GetNSControl() cell];
wxASSERT(cell);
NSSize cellSize = [cell cellSize];
- wxSize size(100,(int)ceilf(cellSize.height));
+ wxSize size(100,(int)ceil(cellSize.height));
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
return size;
}
-