1. wxFrame::IsIconized() fixed - seems to work

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 0be841bad4dabe1a3db99195f50a26b7b2419441..0a3802cb51e1c401f25c9b0d07962286354c96dd 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -1,165 +1,303 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.cpp
 // Purpose:     wxComboBox class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
+#include "wx/combobox.h"
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include "wx/setup.h"

 #endif
 
 #endif
 

+#if wxUSE_COMBOBOX
+

 #include "wx/combobox.h"
 #include "wx/combobox.h"

+#include "wx/clipbrd.h"
+#include "wx/os2/private.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif

 
 

-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)
+bool wxComboBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id))

 {
 {

-    SetName(name);
-    SetValidator(validator);
-    m_noStrings = n;
-    m_windowStyle = style;
-
-    if (parent) parent->AddChild(this);
+  // TODO:
+  /*
+  if (param == CBN_SELCHANGE)
+  {
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId);
+    event.SetInt(GetSelection());
+    event.SetEventObject(this);
+    event.SetString(GetStringSelection());
+    ProcessCommand(event);

 
 

-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
-
-    // TODO: create combobox control
+    return TRUE;
+  }
+  else if (param == CBN_EDITCHANGE)
+  {
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+    event.SetString(GetValue());
+    event.SetEventObject(this);
+    ProcessCommand(event);

 
     return TRUE;
 
     return TRUE;

+  }
+  else
+      return FALSE;
+*/
+  return FALSE;

 }
 
 }
 

-wxString wxComboBox::GetValue() const
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        int n, const wxString choices[],
+                        long style,
+#if wxUSE_VALIDATORS
+                        const wxValidator& validator,
+#endif
+                        const wxString& name)

 {
 {

-    // TODO
-    return wxString("");
+  SetName(name);
+#if wxUSE_VALIDATORS
+  SetValidator(validator);
+#endif
+  if (parent) parent->AddChild(this);
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;
+
+  m_windowStyle = style;
+
+  if ( id == -1 )
+    m_windowId = (int)NewControlId();
+  else
+    m_windowId = id;
+
+  int x = pos.x;
+  int y = pos.y;
+  int width = size.x;
+  int height = size.y;
+// TODO:
+/*
+  long msStyle = WS_CHILD | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL |
+      CBS_NOINTEGRALHEIGHT;
+
+  if (m_windowStyle & wxCB_READONLY)
+    msStyle |= CBS_DROPDOWNLIST;
+  else if (m_windowStyle & wxCB_SIMPLE)
+    msStyle |= CBS_SIMPLE; // A list (shown always) and edit control
+  else
+    msStyle |= CBS_DROPDOWN;
+
+  if (m_windowStyle & wxCB_SORT)
+    msStyle |= CBS_SORT;
+
+  bool want3D;
+  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+
+  // Even with extended styles, need to combine with WS_BORDER
+  // for them to look right.
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )
+    msStyle |= WS_BORDER;
+
+  m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("COMBOBOX"), NULL,
+                   msStyle,
+                   0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
+                   wxGetInstance(), NULL);
+
+  wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create combobox") );
+
+  // Subclass again for purposes of dialog editing mode
+  SubclassWin(m_hWnd);
+
+  SetFont(parent->GetFont());
+  int i;
+  for (i = 0; i < n; i++)
+  {
+    Append(choices[i]);
+  }
+
+  SetSelection(i);
+
+  SetSize(x, y, width, height);
+  if ( !value.IsEmpty() )
+  {
+    SetValue(value);
+  }
+*/
+  return TRUE;

 }
 
 void wxComboBox::SetValue(const wxString& value)
 {
 }
 
 void wxComboBox::SetValue(const wxString& value)
 {

-    // TODO
+  // If newlines are denoted by just 10, must stick 13 in front.
+  int singletons = 0;
+  int len = value.Length();
+  int i;
+  for (i = 0; i < len; i ++)
+  {
+    if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
+      singletons ++;
+  }
+  if (singletons > 0)
+  {
+    wxChar *tmp = new wxChar[len + singletons + 1];
+    int j = 0;
+    for (i = 0; i < len; i ++)
+    {
+      if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
+      {
+        tmp[j] = 13;
+        j ++;
+      }
+      tmp[j] = value[i];
+      j ++;
+    }
+    tmp[j] = 0;
+//    SetWindowText(GetHwnd(), tmp);
+    delete[] tmp;
+  }
+//  else
+//    SetWindowText(GetHwnd(), value);

 }
 
 // Clipboard operations
 void wxComboBox::Copy()
 {
 }
 
 // Clipboard operations
 void wxComboBox::Copy()
 {

-    // TODO
+  HWND hWnd = GetHwnd();
+//  SendMessage(hWnd, WM_COPY, 0, 0L);

 }
 
 void wxComboBox::Cut()
 {
 }
 
 void wxComboBox::Cut()
 {

-    // TODO
+  HWND hWnd = GetHwnd();
+//  SendMessage(hWnd, WM_CUT, 0, 0L);

 }
 
 void wxComboBox::Paste()
 {
 }
 
 void wxComboBox::Paste()
 {

-    // TODO
+  HWND hWnd = GetHwnd();
+//  SendMessage(hWnd, WM_PASTE, 0, 0L);

 }
 
 void wxComboBox::SetEditable(bool editable)
 {
 }
 
 void wxComboBox::SetEditable(bool editable)
 {

-    // TODO
+  // Can't implement in MSW?
+//  HWND hWnd = GetHwnd();
+//  SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);

 }
 
 void wxComboBox::SetInsertionPoint(long pos)
 {
 }
 
 void wxComboBox::SetInsertionPoint(long pos)
 {

-    // TODO
+/*
+  HWND hWnd = GetHwnd();
+  SendMessage(hWnd, EM_SETSEL, pos, pos);
+  SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+  char *nothing = "";
+  SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
+*/

 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {

-    // TODO
+/*
+  long pos = GetLastPosition();
+  SetInsertionPoint(pos);
+*/

 }
 
 long wxComboBox::GetInsertionPoint() const
 {
 }
 
 long wxComboBox::GetInsertionPoint() const
 {

-    // TODO
-    return 0;
+/*
+  DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
+  return Pos&0xFFFF;
+*/
+  return 0;

 }
 
 long wxComboBox::GetLastPosition() const
 {
 }
 
 long wxComboBox::GetLastPosition() const
 {

-    // TODO
-    return 0;
-}
+/*
+    HWND hWnd = GetHwnd();

 
 

-void wxComboBox::Replace(long from, long to, const wxString& value)
-{
-    // TODO
-}
+    // Will always return a number > 0 (according to docs)
+    int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L);

 
 

-void wxComboBox::Remove(long from, long to)
-{
-    // TODO
-}
+    // This gets the char index for the _beginning_ of the last line
+    int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);

 
 

-void wxComboBox::SetSelection(long from, long to)
-{
-    // TODO
-}
+    // Get number of characters in the last line. We'll add this to the character
+    // index for the last line, 1st position.
+    int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L);

 
 

-void wxComboBox::Append(const wxString& item)
-{
-    // TODO
+    return (long)(charIndex + lineLength);
+*/
+  return 0;

 }
 
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Replace(long from, long to, const wxString& value)

 {
 {

-    // TODO
-}
+#if wxUSE_CLIPBOARD
+    HWND hWnd = GetHwnd();
+    long fromChar = from;
+    long toChar = to;

 
 

-void wxComboBox::Clear()
-{
-    // TODO
-}
+    // Set selection and remove it
+//    SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
+//    SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);

 
 

-int wxComboBox::GetSelection() const
-{
-    // TODO
-    return -1;
-}
+    // Now replace with 'value', by pasting.
+    wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);

 
 

-void wxComboBox::SetSelection(int n)
-{
-    // TODO
+    // Paste into edit control
+//    SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
+#endif

 }
 
 }
 

-int wxComboBox::FindString(const wxString& s) const
+void wxComboBox::Remove(long from, long to)

 {
 {

-    // TODO
-    return -1;
-}
+    HWND hWnd = GetHwnd();
+    long fromChar = from;
+    long toChar = to;

 
 

-wxString wxComboBox::GetString(int n) const
-{
-    // TODO
-    return wxString("");
+    // Cut all selected text
+//    SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
+//    SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);

 }
 
 }
 

-wxString wxComboBox::GetStringSelection() const
+void wxComboBox::SetSelection(long from, long to)

 {
 {

-    // TODO
-    return wxString("");
+    HWND hWnd = GetHwnd();
+    long fromChar = from;
+    long toChar = to;
+    // if from and to are both -1, it means
+    // (in wxWindows) that all text should be selected.
+    // This translates into Windows convention
+    if ((from == -1) && (to == -1))
+    {
+      fromChar = 0;
+      toChar = -1;
+    }
+
+//    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar);
+//    SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);

 }
 
 }
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
+void wxComboBox::DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags)

 {
 {

-    // TODO
-    return FALSE;
+    wxControl::DoSetSize(x, y, width, height, sizeFlags);

 }
 }

+
+#endif
+ // wxUSE_COMBOBOX
+