Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finished native wxComboBox implementation; it still needs some testing.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-02-11 17:51:28 +00:00
parent b6e2df0b36
commit 100f92893d
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/motif/combobox_native.cpp
View File

@@ -26,9 +26,15 @@
// use the new, shiny combobox for Motif 2.x // use the new, shiny combobox for Motif 2.x
#if (XmVersion >= 2000) #if (XmVersion >= 2000)
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/ComboBox.h> #include <Xm/ComboBox.h>
#include <Xm/Text.h> #include <Xm/Text.h>
#include <Xm/List.h> #include <Xm/List.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h" #include "wx/motif/private.h"
@@ -246,17 +252,17 @@ int wxComboBox::FindString(const wxString& s) const
// Clipboard operations // Clipboard operations
void wxComboBox::Copy() void wxComboBox::Copy()
{ {
// XmComboBoxCopy((Widget) m_mainWidget, CurrentTime); XmTextCopy( GetXmText(this), CurrentTime );
} }
void wxComboBox::Cut() void wxComboBox::Cut()
{ {
// XmComboBoxCut((Widget) m_mainWidget, CurrentTime); XmTextCut( GetXmText(this), CurrentTime );
} }
void wxComboBox::Paste() void wxComboBox::Paste()
{ {
// XmComboBoxPaste((Widget) m_mainWidget); XmTextPaste( GetXmText(this) );
} }
void wxComboBox::SetEditable(bool WXUNUSED(editable)) void wxComboBox::SetEditable(bool WXUNUSED(editable))
@@ -266,49 +272,44 @@ void wxComboBox::SetEditable(bool WXUNUSED(editable))
void wxComboBox::SetInsertionPoint(long pos) void wxComboBox::SetInsertionPoint(long pos)
{ {
// XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) pos); XmTextSetInsertionPosition( GetXmText(this), (XmTextPosition)pos );
} }
void wxComboBox::SetInsertionPointEnd() void wxComboBox::SetInsertionPointEnd()
{ {
// XmTextPosition pos = XmComboBoxGetLastPosition ((Widget) m_mainWidget); SetInsertionPoint( GetLastPosition() );
// XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) (pos + 1));
} }
long wxComboBox::GetInsertionPoint() const long wxComboBox::GetInsertionPoint() const
{ {
// return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget); return (long)XmTextGetInsertionPosition( GetXmText(this) );
return -1;
} }
long wxComboBox::GetLastPosition() const long wxComboBox::GetLastPosition() const
{ {
// return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget); XmTextPosition pos = XmTextGetLastPosition( GetXmText(this) );
return -1; return (long)pos;
} }
void wxComboBox::Replace(long from, long to, const wxString& value) void wxComboBox::Replace(long from, long to, const wxString& value)
{/* {
XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to,
(char*) (const char*) value); (char*)value.c_str() );
*/
} }
void wxComboBox::Remove(long from, long to) void wxComboBox::Remove(long from, long to)
{ {
/* SetSelection( from, to );
XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, XmTextRemove( GetXmText(this) );
(Time) 0);
XmComboBoxRemove ((Widget) m_mainWidget);
*/
} }
void wxComboBox::SetSelection(long from, long to) void wxComboBox::SetSelection(long from, long to)
{ {
/* if( to == -1 )
XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, to = GetLastPosition();
(Time) 0);
*/ XmTextSetSelection( GetXmText(this), (XmTextPosition)from,
(XmTextPosition)to, (Time)0 );
} }
void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,