#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/utils.h"
+#include "wx/log.h"
#endif
#include "wx/msw/private.h"
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
event.SetInt(GetSelection());
event.SetEventObject(this);
- event.SetString(copystring(GetStringSelection()));
+ event.SetString(GetStringSelection());
ProcessCommand(event);
- delete[] event.GetString();
+
return TRUE;
}
- else return FALSE;
+ else
+ return FALSE;
}
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;
- m_noStrings = n;
+ m_noStrings = 0;
m_windowStyle = style;
if ( want3D || wxStyleHasBorder(m_windowStyle) )
msStyle |= WS_BORDER;
- m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "COMBOBOX", NULL,
+ m_hWnd = (WXHWND)::CreateWindowEx(exStyle, _T("COMBOBOX"), NULL,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
- wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
+ wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create combobox") );
/*
-#if CTL3D
+#if wxUSE_CTL3D
if (want3D)
{
m_useCtl3D = TRUE;
void wxChoice::Append(const wxString& item)
{
- SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
+ SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LONG)(const wxChar *)item);
m_noStrings ++;
}
void wxChoice::Delete(int n)
{
- m_noStrings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
+ m_noStrings = (int)SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
}
void wxChoice::Clear(void)
{
- SendMessage((HWND) GetHWND(), CB_RESETCONTENT, 0, 0);
+ SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
m_noStrings = 0;
}
int wxChoice::GetSelection(void) const
{
- return (int)SendMessage((HWND) GetHWND(), CB_GETCURSEL, 0, 0);
+ return (int)SendMessage(GetHwnd(), CB_GETCURSEL, 0, 0);
}
void wxChoice::SetSelection(int n)
{
- SendMessage((HWND) GetHWND(), CB_SETCURSEL, n, 0);
+ SendMessage(GetHwnd(), CB_SETCURSEL, n, 0);
}
int wxChoice::FindString(const wxString& s) const
char buf[512];
for (int i = 0; i < Number(); i++)
{
- int len = (int)SendMessage((HWND) GetHWND(), CB_GETLBTEXT, i, (LPARAM)(LPSTR)buf);
+ int len = (int)SendMessage(GetHwnd(), CB_GETLBTEXT, i, (LPARAM)(LPSTR)buf);
buf[len] = 0;
if (strcmp(buf, (const char *)s) == 0)
return i;
}
return -1;
#else
- int pos = (int)SendMessage((HWND) GetHWND(), CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)(LPSTR)(const char *)s);
+ int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)(LPSTR)(const wxChar *)s);
if (pos == LB_ERR)
return -1;
else
wxString wxChoice::GetString(int n) const
{
- int len = (int)SendMessage((HWND) GetHWND(), CB_GETLBTEXT, n, (long)wxBuffer);
- wxBuffer[len] = 0;
- return wxString(wxBuffer);
-}
-
-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
-
- int x1 = x;
- int y1 = y;
- int w1 = width;
- int h1 = height;
-
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
-
- AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
- // If we're prepared to use the existing size, then...
- if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
- {
- GetSize(&w1, &h1);
- }
+ size_t len = (size_t)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0);
+ wxString str;
+ if ( ::SendMessage(GetHwnd(), CB_GETLBTEXT, n,
+ (LPARAM)str.GetWriteBuf(len)) == CB_ERR )
+ {
+ wxLogLastError("SendMessage(CB_GETLBTEXT)");
+ }
- int cx; // button font dimensions
- int cy;
- wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+ str.UngetWriteBuf();
- int control_width, control_height;
+ return str;
+}
- // Ignore height parameter because height doesn't
- // mean 'initially displayed' height, it refers to the
- // drop-down menu as well. The wxWindows interpretation
- // is different; also, getting the size returns the
- // _displayed_ size (NOT the drop down menu size)
- // so setting-getting-setting size would not work.
- h1 = -1;
+void wxChoice::DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags)
+{
+ // Ignore height parameter because height doesn't mean 'initially
+ // displayed' height, it refers to the drop-down menu as well. The
+ // wxWindows interpretation is different; also, getting the size returns
+ // the _displayed_ size (NOT the drop down menu size) so
+ // setting-getting-setting size would not work.
+ wxControl::DoSetSize(x, y, width, -1, sizeFlags);
+}
- // Deal with default size (using -1 values)
- if (width <= 0)
- {
- // Find the longest string
- if (m_noStrings == 0)
- {
- control_width = 100;
- }
- else
+wxSize wxChoice::DoGetBestSize()
+{
+ // find the widest string
+ int wLine;
+ int wChoice = 0;
+ for ( int i = 0; i < m_noStrings; i++ )
{
- int len, ht;
- int longest = 0;
- int i;
- for (i = 0; i < m_noStrings; i++)
- {
wxString str(GetString(i));
- GetTextExtent(str, &len, &ht, NULL, NULL, & this->GetFont());
- if ( len > longest)
- longest = len;
- }
-
- control_width = longest + cx*5;
+ GetTextExtent(str, &wLine, NULL);
+ if ( wLine > wChoice )
+ wChoice = wLine;
}
- }
- else
- {
- // If non-default width...
- control_width = w1;
- }
+ // give it some reasonable default value if there are no strings in the
+ // list
+ if ( wChoice == 0 )
+ wChoice = 100;
- // Choice drop-down list depends on number of items (limited to 10)
- if (h1 <= 0)
- {
- if (m_noStrings == 0)
- h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*10;
- else
- h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMin(10, m_noStrings) + 1);
- }
-
- control_height = h1;
+ // the combobox should be larger than the widest string
+ int cx, cy;
+ wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
- // Calculations may have made text size too small
- if (control_height <= 0)
- control_height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+ wChoice += 5*cx;
- if (control_width <= 0)
- control_width = 100;
+ // Choice drop-down list depends on number of items (limited to 10)
+ size_t nStrings = m_noStrings == 0 ? 10 : wxMin(10, m_noStrings) + 1;
+ int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*nStrings;
- MoveWindow((HWND)GetHWND(), x1, y1,
- control_width, control_height, TRUE);
+ return wxSize(wChoice, hChoice);
}
WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
// with x = 65535 and y = 65535.
// Filter out this nonsense.
if (x == 65535 && y == 65535)
- return Default();
+ return 0;
break;
}
}
if (sel > -1)
return wxString(this->GetString (sel));
else
- return wxString("");
+ return wxString(_T(""));
}
bool wxChoice::SetStringSelection (const wxString& s)
projects / wxWidgets.git / blobdiff