Allow passing multi-line strings to wxDC::DrawText(), even under MSW.

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

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index e0fe3d49118e712c0be7d857efe7084f9b5d0e80..b34e2c8caed375143a22e74367d859c7a3eb207b 100644 (file)
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -1,23 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/combobox.mm
+// Name:        src/cocoa/combobox.mm

 // Purpose:     wxComboBox
 // Purpose:     wxComboBox

-// Author:             Ryan Norton
+// Author:      Ryan Norton

 // Modified by:
 // Created:     2005/02/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Modified by:
 // Created:     2005/02/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-// #include "wx/wxprec.h"
-

 //
 // Impl notes:
 //
 // Impl notes:

-// There is no custom data source because doing so unneccesaraly sacrifices
-// some native autocompletion behavior (we would have to make our own - 
+// There is no custom data source because doing so unnecessarily sacrifices
+// some native autocompletion behavior (we would have to make our own -

 // the SimpleComboBox sample does so in the developer folder that
 // comes with OSX).  One reason you might want this would be to have
 // the SimpleComboBox sample does so in the developer folder that
 // comes with OSX).  One reason you might want this would be to have

-// only one array or be able to display numbers by returned an NSNumber
+// only one array or be able to display numbers returned by an NSNumber

 // from the methods.
 //
 // One problem though is that wxCB_SORT isn't implemented...
 // from the methods.
 //
 // One problem though is that wxCB_SORT isn't implemented...


@@ -28,9 +26,9 @@
 // doWxEvent is really hackish... but since there's only one event...
 //
 // Ideas for future improvement - other notes:
 // doWxEvent is really hackish... but since there's only one event...
 //
 // Ideas for future improvement - other notes:

-// Combox w/o wxCB_DROPDOWN doesn't seem to be implementable   
-//wxCB_READONLY        Same as wxCB_DROPDOWN but only the strings specified as the combobox choices can be selected, it is impossible to select (even from a program) a string which is not in the choices list.
-//wxCB_SORT    is possible with data source
+// Combox w/o wxCB_DROPDOWN doesn't seem to be implementable
+//wxCB_READONLY  Same as wxCB_DROPDOWN but only the strings specified as the combobox choices can be selected, it is impossible to select (even from a program) a string which is not in the choices list.
+//wxCB_SORT      is possible with data source

 //
 // setIntercellSpacing:/setItemHeight: to autoadjust to number of inserted items?
 //
 //
 // setIntercellSpacing:/setItemHeight: to autoadjust to number of inserted items?
 //


@@ -55,7 +53,7 @@
     NSString *lowercasePrefix = [prefix lowercaseString];
     NSEnumerator *stringEnum = [genres objectEnumerator];
     while ((string = [stringEnum nextObject])) {
     NSString *lowercasePrefix = [prefix lowercaseString];
     NSEnumerator *stringEnum = [genres objectEnumerator];
     while ((string = [stringEnum nextObject])) {

-       if ([[string lowercaseString] hasPrefix: lowercasePrefix]) return string;
+        if ([[string lowercaseString] hasPrefix: lowercasePrefix]) return string;

     }
     return nil;
 }
     }
     return nil;
 }


@@ -68,17 +66,6 @@
 }
 */
 
 }
 */
 

-/////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/NSComboBox.mm
-// Purpose:     wxCocoaNSComboBox
-// Author:      Ryan Norton
-// Modified by:
-// Created:     2005/02/16
-// RCS-ID:      $Id: 
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
-/////////////////////////////////////////////////////////////////////////////
-

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -88,15 +75,19 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"

+

 #if wxUSE_COMBOBOX
 
 #if wxUSE_COMBOBOX
 

+#include "wx/combobox.h"
+
+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/log.h"
+    #include "wx/app.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/cocoa/ObjcPose.h"
-#include "wx/combobox.h"
-

 #import <AppKit/NSComboBox.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #import <AppKit/NSComboBox.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>


@@ -111,7 +102,7 @@ void wxCocoaNSComboBox::AssociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
     if(cocoaNSComboBox)
     {
         sm_cocoaHash.insert(wxCocoaNSComboBoxHash::value_type(cocoaNSComboBox,this));
     if(cocoaNSComboBox)
     {
         sm_cocoaHash.insert(wxCocoaNSComboBoxHash::value_type(cocoaNSComboBox,this));

-        
+

         [[NSNotificationCenter defaultCenter] addObserver:(id)cocoaNSComboBox selector:@selector(comboBoxSelectionDidChange:) name:@"NSComboBoxSelectionDidChangeNotification" object:cocoaNSComboBox];
         [[NSNotificationCenter defaultCenter] addObserver:(id)cocoaNSComboBox selector:@selector(comboBoxSelectionDidChange:) name:@"NSComboBoxSelectionIsChangingNotification" object:cocoaNSComboBox];
         [[NSNotificationCenter defaultCenter] addObserver:(id)cocoaNSComboBox selector:@selector(comboBoxSelectionDidChange:) name:@"NSComboBoxWillDismissNotification" object:cocoaNSComboBox];
         [[NSNotificationCenter defaultCenter] addObserver:(id)cocoaNSComboBox selector:@selector(comboBoxSelectionDidChange:) name:@"NSComboBoxSelectionDidChangeNotification" object:cocoaNSComboBox];
         [[NSNotificationCenter defaultCenter] addObserver:(id)cocoaNSComboBox selector:@selector(comboBoxSelectionDidChange:) name:@"NSComboBoxSelectionIsChangingNotification" object:cocoaNSComboBox];
         [[NSNotificationCenter defaultCenter] addObserver:(id)cocoaNSComboBox selector:@selector(comboBoxSelectionDidChange:) name:@"NSComboBoxWillDismissNotification" object:cocoaNSComboBox];


@@ -143,6 +134,7 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
 - (void)comboBoxWillDismiss:(NSNotification *)notification;
 - (void)comboBoxWillPopUp:(NSNotification *)notification;
 @end // wxPoserNSComboBox
 - (void)comboBoxWillDismiss:(NSNotification *)notification;
 - (void)comboBoxWillPopUp:(NSNotification *)notification;
 @end // wxPoserNSComboBox

+WX_DECLARE_GET_OBJC_CLASS(wxPoserNSComboBox,NSComboBox)

 
 //WX_IMPLEMENT_POSER(wxPoserNSComboBox);
 @implementation wxPoserNSComboBox : NSComboBox
 
 //WX_IMPLEMENT_POSER(wxPoserNSComboBox);
 @implementation wxPoserNSComboBox : NSComboBox


@@ -169,20 +161,18 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
 }
 
 @end // implementation wxPoserNSComboBox
 }
 
 @end // implementation wxPoserNSComboBox

-
-#include "wx/app.h"
-#include "wx/combobox.h"
-#include "wx/log.h"
+WX_IMPLEMENT_GET_OBJC_CLASS(wxPoserNSComboBox,NSComboBox)

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

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxTextCtrl)
-BEGIN_EVENT_TABLE(wxComboBox, wxTextCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)

 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView)

+WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSTextField,NSControl,NSView)

 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
             const wxString& value,
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
             const wxString& value,


@@ -211,9 +201,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;

-        
+

     m_cocoaNSView = NULL;
     m_cocoaNSView = NULL;

-    SetNSComboBox([[wxPoserNSComboBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
+    SetNSComboBox([[WX_GET_OBJC_CLASS(wxPoserNSComboBox) alloc] initWithFrame:MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
     [GetNSTextField() setStringValue:wxNSStringWithWxString(value.c_str())];
     [GetNSControl() sizeToFit];
     [m_cocoaNSView release];
     [GetNSTextField() setStringValue:wxNSStringWithWxString(value.c_str())];
     [GetNSControl() sizeToFit];


@@ -221,11 +211,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
 
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
 

-    for(int i = 0; i < n; ++i)
-        wxComboBox::DoAppend(choices[i]);
-        
+    wxComboBox::Append(n, choices);
+

     [GetNSComboBox() setCompletes:true]; //autocomplete :)
     [GetNSComboBox() setCompletes:true]; //autocomplete :)

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -240,14 +229,14 @@ void wxComboBox::doWxEvent(int nEvent)
     event2.SetInt(GetSelection());
     event2.SetEventObject(this);
     event2.SetString(GetStringSelection());
     event2.SetInt(GetSelection());
     event2.SetEventObject(this);
     event2.SetString(GetStringSelection());

-    GetEventHandler()->ProcessEvent(event2);
+    HandleWindowEvent(event2);

 
     // For consistency with MSW and GTK, also send a text updated event
     // After all, the text is updated when a selection is made
     wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );
     TextEvent.SetString( GetStringSelection() );
     TextEvent.SetEventObject( this );
 
     // For consistency with MSW and GTK, also send a text updated event
     // After all, the text is updated when a selection is made
     wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );
     TextEvent.SetString( GetStringSelection() );
     TextEvent.SetEventObject( this );

-    GetEventHandler()->ProcessEvent( TextEvent );
+    HandleWindowEvent( TextEvent );

 }
 
 
 }
 
 


@@ -261,75 +250,161 @@ wxString wxComboBox::GetStringSelection()
     return wxStringWithNSString([GetNSComboBox() objectValueOfSelectedItem]);
 }
 
     return wxStringWithNSString([GetNSComboBox() objectValueOfSelectedItem]);
 }
 

-void wxComboBox::Clear()
+void wxComboBox::DoClear()

 {
     [GetNSComboBox() removeAllItems];
     m_Datas.Clear();
 }
 
 {
     [GetNSComboBox() removeAllItems];
     m_Datas.Clear();
 }
 

-void wxComboBox::Delete(int nIndex)
+void wxComboBox::DoDeleteOneItem(unsigned int n)

 {
 {

-    [GetNSComboBox() removeItemAtIndex:nIndex];
-    m_Datas.RemoveAt(nIndex);
+    [GetNSComboBox() removeItemAtIndex:n];
+    m_Datas.RemoveAt(n);

 }
 
 }
 

-int wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const

 {
 {

-    return [GetNSComboBox() numberOfItems];
+    return (unsigned int)[GetNSComboBox() numberOfItems];

 }
 
 }
 

-wxString wxComboBox::GetString(int nIndex) const
-{      return wxStringWithNSString([GetNSComboBox() itemObjectValueAtIndex:nIndex]);   }
+wxString wxComboBox::GetString(unsigned int nIndex) const
+{
+    return wxStringWithNSString([GetNSComboBox() itemObjectValueAtIndex:nIndex]);
+}

 
 

-void wxComboBox::SetString(int nIndex, const wxString& szString)
-{      
+void wxComboBox::SetString(unsigned int nIndex, const wxString& szString)
+{

     wxAutoNSAutoreleasePool pool;
     //FIXME:  There appears to be no "set item data" method - maybe
     //an assignment would work?
     [GetNSComboBox() removeItemAtIndex:nIndex];
     wxAutoNSAutoreleasePool pool;
     //FIXME:  There appears to be no "set item data" method - maybe
     //an assignment would work?
     [GetNSComboBox() removeItemAtIndex:nIndex];

-    [GetNSComboBox() insertItemWithObjectValue:wxNSStringWithWxString(szString) atIndex:nIndex];    
+    [GetNSComboBox() insertItemWithObjectValue:wxNSStringWithWxString(szString) atIndex:nIndex];

 }
 
 }
 

-int wxComboBox::FindString(const wxString& szItem) const
-{      return [GetNSComboBox() indexOfItemWithObjectValue:wxNSStringWithWxString(szItem)];     }
+int wxComboBox::FindString(const wxString& szItem, bool bCase) const
+{
+    // FIXME: use wxItemContainerImmutable::FindString for bCase parameter
+    return [GetNSComboBox() indexOfItemWithObjectValue:wxNSStringWithWxString(szItem)];
+}

 
 int wxComboBox::GetSelection() const
 
 int wxComboBox::GetSelection() const

-{      return [GetNSComboBox() indexOfSelectedItem];   }
-
-int wxComboBox::DoAppend(const wxString& szItem)

 {
 {

-    m_Datas.Add(NULL);
-    wxAutoNSAutoreleasePool pool;
-    [GetNSComboBox() addItemWithObjectValue:wxNSStringWithWxString(szItem)];
-    return [GetNSComboBox() numberOfItems];
+    return [GetNSComboBox() indexOfSelectedItem];

 }
 
 }
 

-int wxComboBox::DoInsert(const wxString& szItem, int nIndex)
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData,
+                              wxClientDataType type)

 {
 {

-    m_Datas.Insert(NULL, nIndex);

     wxAutoNSAutoreleasePool pool;
     wxAutoNSAutoreleasePool pool;

-    [GetNSComboBox() insertItemWithObjectValue:wxNSStringWithWxString(szItem) atIndex:nIndex];
-    return nIndex;
+    const unsigned int numITems = items.GetCount();
+    for ( unsigned int i = 0; i < numITems; ++i, ++pos )
+    {
+        [GetNSComboBox() insertItemWithObjectValue:wxNSStringWithWxString(items[i]) atIndex:(pos)];
+        m_Datas.Insert(NULL, pos);
+        AssignNewItemClientData(pos, clientData, i, type);
+    }
+    return pos - 1;

 }
 
 }
 

-void wxComboBox::DoSetItemClientData(int nIndex, void* pData)
+void wxComboBox::DoSetItemClientData(unsigned int nIndex, void* pData)

 {
     m_Datas[nIndex] = pData;
 }
 
 {
     m_Datas[nIndex] = pData;
 }
 

-void* wxComboBox::DoGetItemClientData(int nIndex) const
+void* wxComboBox::DoGetItemClientData(unsigned int nIndex) const

 {
     return m_Datas[nIndex];
 }
 
 {
     return m_Datas[nIndex];
 }
 

-void wxComboBox::DoSetItemClientObject(int nIndex, wxClientData* pClientData)
+/////////////////////////////////////////////////////////////////////////////
+// wxTextEntry virtual implementations:
+
+void wxComboBox::WriteText(wxString const&)
+{
+}
+
+wxString wxComboBox::GetValue() const

 {
 {

-    m_Datas[nIndex] = (void*) pClientData;
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSTextField() stringValue]);

 }
 
 }
 

-wxClientData* wxComboBox::DoGetItemClientObject(int nIndex) const
+void wxComboBox::Remove(long, long)

 {
 {

-    return (wxClientData*) m_Datas[nIndex];

 }
 
 }
 

-#endif //wxUSE_COMBOBOX
+void wxComboBox::Cut()
+{
+}
+
+void wxComboBox::Copy()
+{
+}
+
+void wxComboBox::Paste()
+{
+}
+
+void wxComboBox::Undo()
+{
+}
+
+void wxComboBox::Redo()
+{
+}
+
+bool wxComboBox::CanUndo() const
+{
+    return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+    return false;
+}
+
+void wxComboBox::SetInsertionPoint(long)
+{
+}
+
+long wxComboBox::GetInsertionPoint() const
+{
+    return 0;
+}
+
+wxTextPos wxComboBox::GetLastPosition() const
+{
+    // working - returns the size of the wxString
+    return (long)(GetValue().Len());
+}
+
+void wxComboBox::SetSelection(long, long)
+{
+}
+
+void wxComboBox::GetSelection(long*, long*) const
+{
+}
+
+bool wxComboBox::IsEditable() const
+{
+    return [GetNSTextField() isEditable];
+}
+
+void wxComboBox::SetEditable(bool editable)
+{
+    // first ensure that the current value is stored (in case the user had not finished editing
+    // before SetEditable(FALSE) was called)
+    DoSetValue(GetValue(),1);
+
+    [GetNSTextField() setEditable: editable];
+
+    // forces the focus on the textctrl to be lost - while focus is still maintained
+    // after SetEditable(FALSE) the user may still edit the control
+    // (might not the best way to do this..)
+    [GetNSTextField() abortEditing];
+}
+
+#endif // wxUSE_COMBOBOX