Latex updates; added defines to printdlg.h for referring to generic print dialogs

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index cdda376aeefb385996d3f62b09fe91a30f8a4bb4..01a8df28be26932632ecbdcbc93ed50bf1b7ab33 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -24,7 +24,7 @@
 #include "wx/setup.h"
 #endif
 
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
 #include "wx/clipbrd.h"
@@ -38,7 +38,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
   if (param == CBN_SELCHANGE)
   {
-    wxCommandEvent event(wxEVENT_TYPE_COMBOBOX_COMMAND, m_windowId);
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId);
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(copystring(GetStringSelection()));
@@ -46,6 +46,15 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     delete[] event.GetString();
     return TRUE;
   }
+  else if (param == CBN_EDITCHANGE)
+  {
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+    event.SetString(copystring(GetValue()));
+    event.SetEventObject(this);
+    ProcessCommand(event);
+    delete[] event.GetString();
+    return TRUE;
+  }
   else return FALSE;
 }
 
@@ -63,7 +72,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
   SetForegroundColour(parent->GetDefaultForegroundColour()) ;
-  no_strings = n;
+  m_noStrings = n;
 
   m_windowStyle = style;
 
@@ -130,10 +139,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
-wxString wxComboBox::GetValue(void) const
+wxString wxComboBox::GetValue() const
 {
-  GetWindowText((HWND) GetHWND(), wxBuffer, 500);
-  return wxString(wxBuffer);
+  return wxGetWindowText(GetHWND());
 }
 
 void wxComboBox::SetValue(const wxString& value)
@@ -170,19 +178,19 @@ void wxComboBox::SetValue(const wxString& value)
 }
 
 // Clipboard operations
-void wxComboBox::Copy(void)
+void wxComboBox::Copy()
 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, WM_COPY, 0, 0L);
 }
 
-void wxComboBox::Cut(void)
+void wxComboBox::Cut()
 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, WM_CUT, 0, 0L);
 }
 
-void wxComboBox::Paste(void)
+void wxComboBox::Paste()
 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, WM_PASTE, 0, 0L);
@@ -210,7 +218,7 @@ void wxComboBox::SetInsertionPoint(long pos)
 */
 }
 
-void wxComboBox::SetInsertionPointEnd(void)
+void wxComboBox::SetInsertionPointEnd()
 {
 /*
   long pos = GetLastPosition();
@@ -218,7 +226,7 @@ void wxComboBox::SetInsertionPointEnd(void)
 */
 }
 
-long wxComboBox::GetInsertionPoint(void) const
+long wxComboBox::GetInsertionPoint() const
 {
 /*
   DWORD Pos=(DWORD)SendMessage((HWND) GetHWND(), EM_GETSEL, 0, 0L);
@@ -227,7 +235,7 @@ long wxComboBox::GetInsertionPoint(void) const
   return 0;
 }
 
-long wxComboBox::GetLastPosition(void) const
+long wxComboBox::GetLastPosition() const
 {
 /*
     HWND hWnd = (HWND) GetHWND();
@@ -249,7 +257,7 @@ long wxComboBox::GetLastPosition(void) const
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
     long toChar = to;
@@ -309,5 +317,5 @@ void wxComboBox::SetSelection(long from, long to)
 }
 
 #endif
- // USE_COMBOBOX
+ // wxUSE_COMBOBOX