fixed wrong assert

[wxWidgets.git] / src / qt / combobox.cpp

diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp
index 7a2d9ef0635d771d0cd10a60d43cb9225c449bd8..f1bbccaeb0f0f3b0b0faec3b7ae8e815ba9f460d 100644 (file)
--- a/src/qt/combobox.cpp
+++ b/src/qt/combobox.cpp
@@ -1,10 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxComboBox class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,136 +15,102 @@
 
 #include "wx/combobox.h"
 
-//-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-
-bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
-  const wxPoint& pos, const wxSize& size, int n, const wxString choices[],
-  long style, const wxString& name )
-{
-  return TRUE;
-};
-
-void wxComboBox::Clear(void)
-{
-};
-
-void wxComboBox::Append( const wxString &item )
-{
-  Append( item, (char*)NULL );
-};
-
-void wxComboBox::Append( const wxString &WXUNUSED(item), char *WXUNUSED(clientData) )
-{
-};
-
-void wxComboBox::Delete( int WXUNUSED(n) )
-{
-};
-
-int wxComboBox::FindString( const wxString &WXUNUSED(item) )
-{
-  return -1;
-};
-
-char* wxComboBox::GetClientData( int WXUNUSED(n) )
-{
-  return (char*)NULL;
-};
-
-void wxComboBox::SetClientData( int WXUNUSED(n), char *WXUNUSED(clientData) )
-{
-};
-
-int wxComboBox::GetSelection(void) const
-{
-  return -1;
-};
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
+#endif
 
-wxString wxComboBox::GetString( int WXUNUSED(n) ) const
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+                  int n, const wxString choices[],
+                  long style,
+           const wxValidator& validator,
+           const wxString& name)
 {
-  return "";
-};
+    SetName(name);
+    SetValidator(validator);
+    m_noStrings = n;
+    m_windowStyle = style;
 
-wxString wxComboBox::GetStringSelection(void) const
-{
-  return "";
-};
+    if (parent) parent->AddChild(this);
 
-int wxComboBox::Number(void) const
-{
-  return 0;
-};
+    if ( id == -1 )
+       m_windowId = (int)NewControlId();
+    else
+       m_windowId = id;
 
-void wxComboBox::SetSelection( int WXUNUSED(n) )
-{
-};
+    // TODO: create combobox control
 
-void wxComboBox::SetStringSelection( const wxString &string )
-{
-  int res = FindString( string );
-  if (res == -1) return;
-  SetSelection( res );
-};
+    return TRUE;
+}
 
-wxString wxComboBox::GetValue(void) const
+wxString wxComboBox::GetValue() const
 {
-  return "";
-};
+    // TODO
+    return wxString("");
+}
 
-void wxComboBox::SetValue( const wxString& WXUNUSED(value) )
+void wxComboBox::SetValue(const wxString& value)
 {
-};
+    // TODO
+}
 
-void wxComboBox::Copy(void)
+// Clipboard operations
+void wxComboBox::Copy()
 {
-};
+    // TODO
+}
 
-void wxComboBox::Cut(void)
+void wxComboBox::Cut()
 {
-};
+    // TODO
+}
 
-void wxComboBox::Paste(void)
+void wxComboBox::Paste()
 {
-};
+    // TODO
+}
 
-void wxComboBox::SetInsertionPoint( long WXUNUSED(pos) )
+void wxComboBox::SetEditable(bool editable)
 {
-};
+    // TODO
+}
 
-void wxComboBox::SetInsertionPointEnd(void)
+void wxComboBox::SetInsertionPoint(long pos)
 {
-};
+    // TODO
+}
 
-long wxComboBox::GetInsertionPoint(void) const
+void wxComboBox::SetInsertionPointEnd()
 {
-  return 0;
-};
+    // TODO
+}
 
-long wxComboBox::GetLastPosition(void) const
+long wxComboBox::GetInsertionPoint() const
 {
-  return 0;
-};
+    // TODO
+    return 0;
+}
 
-void wxComboBox::Replace( long WXUNUSED(from), long WXUNUSED(to), const wxString& WXUNUSED(value) )
+long wxComboBox::GetLastPosition() const
 {
-};
+    // TODO
+    return 0;
+}
 
-void wxComboBox::Remove(long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::Replace(long from, long to, const wxString& value)
 {
-};
+    // TODO
+}
 
-void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::Remove(long from, long to)
 {
-};
+    // TODO
+}
 
-void wxComboBox::SetEditable( bool WXUNUSED(editable) )
+void wxComboBox::SetSelection(long from, long to)
 {
-};
+    // TODO
+}
 
-