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

Fixed various wxMSW compile problems that came down the telephone line...

Browse Source 
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes,
doc changes. Sorry about the quantity :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/choice.cpp
View File

@@ -58,7 +58,7 @@ bool wxChoice::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;
@@ -121,19 +121,19 @@ void wxChoice::Append(const wxString& item)
{
SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
no_strings ++;
m_noStrings ++;
}
void wxChoice::Delete(int n)
{
no_strings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
m_noStrings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
}
void wxChoice::Clear(void)
{
SendMessage((HWND) GetHWND(), CB_RESETCONTENT, 0, 0);
no_strings = 0;
m_noStrings = 0;
}
@@ -218,14 +218,14 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
if (width <= 0)
{
// Find the longest string
if (no_strings == 0)
if (m_noStrings == 0)
control_width = (float)100.0;
else
{
int len, ht;
float longest = (float)0.0;
int i;
for (i = 0; i < no_strings; i++)
for (i = 0; i < m_noStrings; i++)
{
wxString str(GetString(i));
GetTextExtent(str, &len, &ht, NULL, NULL,GetFont());
@@ -239,9 +239,9 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
// Choice drop-down list depends on number of items (limited to 10)
if (h1 <= 0)
{
if (no_strings == 0)
if (m_noStrings == 0)
h1 = (int)(EDIT_CONTROL_FACTOR*cy*10.0);
else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, no_strings) + 1));
else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, m_noStrings) + 1));
}
// If non-default width...