projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix removing menu item, ticket 3387
[wxWidgets.git]
/
src
/
common
/
clrpickercmn.cpp
diff --git
a/src/common/clrpickercmn.cpp
b/src/common/clrpickercmn.cpp
index 75295088d8db4670743eca1af90f609c52dcb3cc..5cbd6a7058ad6def1e9cbb6061939516d08c0e69 100644
(file)
--- a/
src/common/clrpickercmn.cpp
+++ b/
src/common/clrpickercmn.cpp
@@
-32,6
+32,8
@@
#include "wx/textctrl.h"
#endif
#include "wx/textctrl.h"
#endif
+const char wxColourPickerCtrlNameStr[] = "colourpicker";
+const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
// ============================================================================
// implementation
// ============================================================================
// implementation
@@
-59,7
+61,8
@@
bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
// we are not interested to the ID of our picker as we connect
// to its "changed" event dynamically...
// we are not interested to the ID of our picker as we connect
// to its "changed" event dynamically...
- m_picker = new wxColourPickerWidget(this, wxID_ANY, col, wxPoint(40,0), wxSize(30,-1),
+ m_picker = new wxColourPickerWidget(this, wxID_ANY, col,
+ wxDefaultPosition, wxDefaultSize,
GetPickerStyle(style));
// complete sizer creation
GetPickerStyle(style));
// complete sizer creation