projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No changes, just update a comment about default buttons in wxMSW.
[wxWidgets.git]
/
samples
/
widgets
/
bmpcombobox.cpp
diff --git
a/samples/widgets/bmpcombobox.cpp
b/samples/widgets/bmpcombobox.cpp
index 8fa31d05684f5994f9069a01b66d6a2773e4a75e..d65f82c2598f11a99120c44be566568d5d011b86 100644
(file)
--- a/
samples/widgets/bmpcombobox.cpp
+++ b/
samples/widgets/bmpcombobox.cpp
@@
-486,7
+486,7
@@
void BitmapComboBoxWidgetsPage::CreateCombo()
m_sizerCombo->Add(m_combobox, 0, wxGROW | wxALL, 5);
m_sizerCombo->Layout();
m_sizerCombo->Add(m_combobox, 0, wxGROW | wxALL, 5);
m_sizerCombo->Layout();
- // Allow changing height inorder to demonstrate flexible
+ // Allow changing height in
order to demonstrate flexible
// size of image "thumbnail" painted in the control itself.
long h = 0;
m_textChangeHeight->GetValue().ToLong(&h);
// size of image "thumbnail" painted in the control itself.
long h = 0;
m_textChangeHeight->GetValue().ToLong(&h);
@@
-712,10
+712,10
@@
void BitmapComboBoxWidgetsPage::LoadWidgetImages( wxArrayString* strings, wxImag
#if wxUSE_IMAGE
wxASSERT(fn.FileExists());
wxImage image(fn.GetFullPath());
#if wxUSE_IMAGE
wxASSERT(fn.FileExists());
wxImage image(fn.GetFullPath());
- wxASSERT(image.Ok());
+ wxASSERT(image.
Is
Ok());
RescaleImage(image, foundSize.x, foundSize.y);
wxBitmap bmp(image);
RescaleImage(image, foundSize.x, foundSize.y);
wxBitmap bmp(image);
- wxASSERT( bmp.Ok() );
+ wxASSERT( bmp.
Is
Ok() );
#else
wxBitmap bmp(wxNullBitmap);
#endif
#else
wxBitmap bmp(wxNullBitmap);
#endif
@@
-842,7
+842,7
@@
wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& filepath)
}
wxImage image(filepath);
}
wxImage image(filepath);
- if ( image.Ok() )
+ if ( image.
Is
Ok() )
{
// Rescale very large images
int ow = image.GetWidth();
{
// Rescale very large images
int ow = image.GetWidth();
@@
-884,7
+884,7
@@
wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr)
::wxSetCursor( *wxHOURGLASS_CURSOR );
::wxSetCursor( *wxHOURGLASS_CURSOR );
- if (
filepath.length
() )
+ if (
!filepath.empty
() )
{
if ( pStr )
{
{
if ( pStr )
{