-/*=========================================================================
-
+/*=========================================================================
Program: bbtk
Module: $RCSfile: bbwxColourSelectorButton.cxx,v $
Language: C++
- Date: $Date: 2008/02/20 11:36:29 $
- Version: $Revision: 1.1 $
-
- Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
- l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
+ Date: $Date: 2008/11/24 15:45:51 $
+ Version: $Revision: 1.6 $
=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+* This software is governed by the CeCILL-B license under French law and
+* abiding by the rules of distribution of free software. You can use,
+* modify and/ or redistribute the software under the terms of the CeCILL-B
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+* or in the file LICENSE.txt.
+*
+* As a counterpart to the access to the source code and rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty and the software's author, the holder of the
+* economic rights, and the successive licensors have only limited
+* liability.
+*
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */
+
/**
- * \file
+ * \file
* \brief Short description in one line
*
- * Long
+ * Long
* description
- *
+ *
*/
#ifdef _USE_WXWIDGETS_
namespace bbwx
{
-
//-------------------------------------------------------------------------
-wxColourPickerCtrlWidget::wxColourPickerCtrlWidget( ColourSelectorButton* box,
+wxColourPickerCtrlWidget::wxColourPickerCtrlWidget( ColourSelectorButton* box,
wxWindow *parent,
unsigned char cr,
unsigned char cg,
);
picker->SetPickerCtrlGrowable(false);
picker->SetTextCtrlGrowable(false);
-
+
Connect ( picker->GetId(),
wxEVT_COMMAND_COLOURPICKER_CHANGED,
wxColourPickerEventHandler( wxColourPickerCtrlWidget::OnColorChange ) );
-
+
bbtkDebugMessage("Process",9,"<= wxColourPickerCtrlWidget::wxColourPickerCtrlWidget"<<std::endl);
wxFlexGridSizer *sizer = new wxFlexGridSizer(10);
sizer -> AddGrowableRow(0);
- sizer -> Add( picker, 1, wxEXPAND, 0 );
+ sizer -> Add( picker, 1, wxEXPAND, 0 );
panel -> SetSizer(sizer);
}
//--------------------------------------------------------------------------
- BBTK_USER_BLACK_BOX_IMPLEMENTATION(ColourSelectorButton,bbtk::WxBlackBox);
+ BBTK_BLACK_BOX_IMPLEMENTATION(ColourSelectorButton,bbtk::WxBlackBox);
BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ColourSelectorButton);
void ColourSelectorButton::bbUserConstructor()
*
*
*/
- void ColourSelectorButton::CreateWidget()
+ void ColourSelectorButton::CreateWidget(wxWindow* parent)
{
bbtkDebugMessage("Process",9,"=> ColourSelectorButton::CreateWidget()"<<std::endl);
cg = (unsigned char)(255.*g);
cb = (unsigned char)(255.*b);
- pickerWidget = new wxColourPickerCtrlWidget(this, bbGetWxParent() , cr , cg , cb );
+ pickerWidget = new wxColourPickerCtrlWidget(this, //bbGetWxParent() ,
+ parent,
+ cr , cg , cb );
bbtkDebugMessage("Process",9,"<= ColourSelectorButton::CreateWidget()"<<std::endl);