key/char event changes for inline editing (japanese/hirgana etc)

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

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index e0fe3d49118e712c0be7d857efe7084f9b5d0e80..0e19e3d340ff9752fb0fb29aaf07e1f4c3c71bb9 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:     wxWidgets 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
 // ============================================================================


@@ -111,7 +98,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];


@@ -211,7 +198,7 @@ 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;
     SetNSComboBox([[wxPoserNSComboBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     m_cocoaNSView = NULL;
     SetNSComboBox([[wxPoserNSComboBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];


@@ -223,9 +210,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
 
     for(int i = 0; i < n; ++i)
         wxComboBox::DoAppend(choices[i]);
 
     for(int i = 0; i < n; ++i)
         wxComboBox::DoAppend(choices[i]);

-        
+

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

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -279,22 +266,29 @@ int wxComboBox::GetCount() const
 }
 
 wxString wxComboBox::GetString(int nIndex) const
 }
 
 wxString wxComboBox::GetString(int nIndex) const

-{      return wxStringWithNSString([GetNSComboBox() itemObjectValueAtIndex:nIndex]);   }
+{
+    return wxStringWithNSString([GetNSComboBox() itemObjectValueAtIndex:nIndex]);
+}

 
 void wxComboBox::SetString(int nIndex, const wxString& szString)
 
 void wxComboBox::SetString(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];   }
+{
+    return [GetNSComboBox() indexOfSelectedItem];
+}

 
 int wxComboBox::DoAppend(const wxString& szItem)
 {
 
 int wxComboBox::DoAppend(const wxString& szItem)
 {