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

Build fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-22 19:28:37 +00:00
parent b875c8a8fc
commit f5c479ccfc
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generic/datectlg.cpp
View File

@@ -194,7 +194,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
wxRect r(0,0,bw, bh); wxRect r(0,0,bw, bh);
wxRendererNative& renderer = wxRendererNative::Get(); wxRendererNative& renderer = wxRendererNative::Get();
#ifdef __WXGTK__ #ifdef __WXGTK__
wxColour magic(255,0,255); wxColour magic(255,0,255);
dc.SetBrush( wxBrush( magic ) ); dc.SetBrush( wxBrush( magic ) );
@@ -210,7 +210,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
wxBitmap bmpSel(bw, bh); wxBitmap bmpSel(bw, bh);
dc.SelectObject(bmpSel); dc.SelectObject(bmpSel);
#ifdef __WXGTK__ #ifdef __WXGTK__
dc.SetBrush( wxBrush( magic ) ); dc.SetBrush( wxBrush( magic ) );
dc.SetPen( *wxTRANSPARENT_PEN ); dc.SetPen( *wxTRANSPARENT_PEN );
@@ -220,7 +220,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
bmpSel.SetMask( mask ); bmpSel.SetMask( mask );
#else #else
renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED); renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
#endif #endif
SetBitmapSelected(bmpSel); SetBitmapSelected(bmpSel);
} }
@@ -567,10 +567,11 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
allowedChars.Add(wxString(*p++, 1)); allowedChars.Add(wxString(*p++, 1));
} }
#if wxUSE_VALIDATORS
wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST); wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
tv.SetIncludes(allowedChars); tv.SetIncludes(allowedChars);
m_txt->SetValidator(tv); m_txt->SetValidator(tv);
#endif
if (m_currentDate.IsValid()) if (m_currentDate.IsValid())
m_txt->SetValue(m_currentDate.Format(m_format)); m_txt->SetValue(m_currentDate.Format(m_format));

8
src/generic/dbgrptg.cpp
View File

@@ -168,9 +168,11 @@ wxDumpOpenExternalDlg::wxDumpOpenExternalDlg(wxWindow *parent,
wxID_ANY, wxID_ANY,
wxEmptyString, wxEmptyString,
wxDefaultPosition, wxDefaultPosition,
wxSize(250, -1), wxSize(250, wxDefaultCoord),
0, 0
wxTextValidator(wxFILTER_NONE, &m_command) #if wxUSE_VALIDATORS
,wxTextValidator(wxFILTER_NONE, &m_command)
#endif
); );
sizerH->Add(command, sizerH->Add(command,
wxSizerFlags(1).Align(wxALIGN_CENTER_VERTICAL)); wxSizerFlags(1).Align(wxALIGN_CENTER_VERTICAL));

6
src/generic/listctrl.cpp
View File

@@ -170,7 +170,7 @@ struct wxColWidthInfo
} }
}; };
WX_DEFINE_ARRAY(wxColWidthInfo *, ColWidthArray); WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxListItemData (internal) // wxListItemData (internal)
@@ -4501,9 +4501,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
// calculate the width of the item and adjust the max column width // calculate the width of the item and adjust the max column width
wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn()); wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
int width = 0; int width = GetItemWidthWithImage(&item);
width = GetItemWidthWithImage(&item);
item.SetWidth(width); item.SetWidth(width);
if (width > pWidthInfo->nMaxWidth) if (width > pWidthInfo->nMaxWidth)
pWidthInfo->nMaxWidth = width; pWidthInfo->nMaxWidth = width;