projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxFilePickerCtrl::SetInitialDirectory().
[wxWidgets.git]
/
utils
/
screenshotgen
/
src
/
customcombo.cpp
diff --git
a/utils/screenshotgen/src/customcombo.cpp
b/utils/screenshotgen/src/customcombo.cpp
index 447c5aaeb90768293af36de57762e1342c19088a..d98c4a683e63db4b94d107881a0580fb3962f29b 100644
(file)
--- a/
utils/screenshotgen/src/customcombo.cpp
+++ b/
utils/screenshotgen/src/customcombo.cpp
@@
-3,7
+3,7
@@
// Purpose: Implement some custom wxComboCtrls
// Author: Utensil Candel (UtensilCandel@@gmail.com)
// RCS-ID: $Id$
// Purpose: Implement some custom wxComboCtrls
// Author: Utensil Candel (UtensilCandel@@gmail.com)
// RCS-ID: $Id$
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
@@
-44,10
+44,10
@@
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-//
wx
PenStyleComboBox
+// PenStyleComboBox
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-void
wx
PenStyleComboBox::OnDrawItem( wxDC& dc,
+void PenStyleComboBox::OnDrawItem( wxDC& dc,
const wxRect& rect,
int item,
int flags ) const
const wxRect& rect,
int item,
int flags ) const
@@
-103,7
+103,7
@@
void wxPenStyleComboBox::OnDrawItem( wxDC& dc,
}
}
}
}
-void
wx
PenStyleComboBox::OnDrawBackground( wxDC& dc, const wxRect& rect,
+void PenStyleComboBox::OnDrawBackground( wxDC& dc, const wxRect& rect,
int item, int flags ) const
{
// If item is selected or even, or we are painting the
int item, int flags ) const
{
// If item is selected or even, or we are painting the
@@
-122,7
+122,7
@@
void wxPenStyleComboBox::OnDrawBackground( wxDC& dc, const wxRect& rect,
dc.DrawRectangle(rect);
}
dc.DrawRectangle(rect);
}
-inline wxCoord
wx
PenStyleComboBox::OnMeasureItem( size_t item ) const
+inline wxCoord PenStyleComboBox::OnMeasureItem( size_t item ) const
{
// Simply demonstrate the ability to have variable-height items
if ( item & 1 )
{
// Simply demonstrate the ability to have variable-height items
if ( item & 1 )
@@
-131,14
+131,14
@@
inline wxCoord wxPenStyleComboBox::OnMeasureItem( size_t item ) const
return 24;
}
return 24;
}
-inline wxCoord
wx
PenStyleComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
+inline wxCoord PenStyleComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
{
return -1; // default - will be measured from text width
}
{
return -1; // default - will be measured from text width
}
-
wxPenStyleComboBox * wx
PenStyleComboBox::CreateSample(wxWindow* parent)
+
PenStyleComboBox *
PenStyleComboBox::CreateSample(wxWindow* parent)
{
{
-
wx
PenStyleComboBox* odc;
+ PenStyleComboBox* odc;
// Common list of items for all dialogs.
wxArrayString arrItems;
// Common list of items for all dialogs.
wxArrayString arrItems;
@@
-161,7
+161,7
@@
wxPenStyleComboBox * wxPenStyleComboBox::CreateSample(wxWindow* parent)
// When defining derivative class for callbacks, we need
// to use two-stage creation (or redefine the common wx
// constructor).
// When defining derivative class for callbacks, we need
// to use two-stage creation (or redefine the common wx
// constructor).
- odc = new
wx
PenStyleComboBox();
+ odc = new PenStyleComboBox();
odc->Create(parent,wxID_ANY,wxEmptyString,
wxDefaultPosition, wxDefaultSize,
arrItems,
odc->Create(parent,wxID_ANY,wxEmptyString,
wxDefaultPosition, wxDefaultSize,
arrItems,
@@
-172,9
+172,9
@@
wxPenStyleComboBox * wxPenStyleComboBox::CreateSample(wxWindow* parent)
odc->SetSelection(0);
// Load images from disk
odc->SetSelection(0);
// Load images from disk
- wxImage imgNormal(wxT("dropbutn.png"));
- wxImage imgPressed(wxT("dropbutp.png"));
- wxImage imgHover(wxT("dropbuth.png"));
+ wxImage imgNormal(wxT("
bitmaps/
dropbutn.png"));
+ wxImage imgPressed(wxT("
bitmaps/
dropbutp.png"));
+ wxImage imgHover(wxT("
bitmaps/
dropbuth.png"));
if ( imgNormal.IsOk() && imgPressed.IsOk() && imgHover.IsOk() )
{
if ( imgNormal.IsOk() && imgPressed.IsOk() && imgHover.IsOk() )
{