Feature #1665 . RaC - Changes to display properties dialog in windows and a better...

diff --git a/data/icons/wxart_editProperties.xpm b/data/icons/wxart_editProperties.xpm
index 2c54498a2b749b82471c1e7c440318a694ec25e5..63c8ac43025a173cc4c95975f9b214a2239a20bf 100644 (file)
--- a/data/icons/wxart_editProperties.xpm
+++ b/data/icons/wxart_editProperties.xpm
@@ -1,36 +1,24 @@
 /* XPM */
-static char * editProperties_xpm[] = {
-"16 16 17 1",
+static const char * editProperties_xpm[] = {
+"16 16 5 1",
 "      c None",
 ".     c #383838",
-"+     c #484848",
-"@     c #888888",
-"#     c #121212",
-"$     c #4C4C4C",
-"%     c #3A3A3A",
-"&     c #474747",
-"*     c #535353",
-"=     c #515151",
-"-     c #919191",
-";     c #525252",
-">     c #8F8F8F",
-",     c #8C8C8C",
-"'     c #4D4D4D",
-")     c #838383",
-"!     c #3C3C3C",
-"       .+@      ",
-"      ###$      ",
-"      ###%      ",
-"       &&       ",
-"     *===       ",
-"    #####       ",
-"     ####       ",
-"      ###       ",
-"       ##       ",
-"       ##       ",
-"       ##       ",
-"       ##=      ",
-"       ##=      ",
-"     -;##*>,@   ",
-"    #######')   ",
-"    #######!    "};
+"+     c #000000",
+"@     c #121212",
+"#     c #525252",
+"                ",
+"      +++       ",
+"      +++       ",
+"      +++       ",
+"                ",
+"     @@@@       ",
+"     @@@@       ",
+"       @@       ",
+"       @@       ",
+"       @@       ",
+"       @@       ",
+"       @@       ",
+"       @@       ",
+"       @@       ",
+"     @@@@@@     ",
+"     @@@@@@     "};

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index b7fb989f9145d65c2075d126c8b34d9c5de0dd95..08a1b0798e9e67d42771ace6f07e520f6f75d04e 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -150,7 +150,10 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->AddTool(ID_ADDCOMPLEXBOXOUTPUT, _T("Add output to Complex box"),
                        bmp_complexoutputport, wxNullBitmap, wxITEM_NORMAL,
                        _T("Add output Complex box"), _T("Add output Complex box"));
-       toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, false);
+
+       // toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, false); RaC2012 2nd HackFest
+       toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, true);
+
        toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT, false);
        toolbar->AddSeparator();
        toolbar->AddTool(ID_UNDO, _T("Undo"),bmp_undo, wxNullBitmap, wxITEM_NORMAL,     _T("Undo"), _T("Undo"));

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx
index 4351e4a9eae357f568b33e5e2ee25ac10f5ab4da..2fd33a7bb40313d07ab9f75145c8ad9d1637080c 100755 (executable)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx
@@ -40,7 +40,7 @@ namespace bbtk
 {
        //=========================================================================
 
-       wxDiagramPropertiesEditionDialog::wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent):wxDialog(parent,wxID_ANY,_T("Diagram Properties"), wxDefaultPosition, wxSize(420, 340),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+       wxDiagramPropertiesEditionDialog::wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent):wxDialog(parent,wxID_ANY,_T("Diagram Properties"), wxDefaultPosition, wxSize(320, 280),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
        {
                _parent = parent;
                constructDiagramPropertiesEditionDialog();
@@ -115,7 +115,7 @@ namespace bbtk
                fgsizer->AddGrowableCol(1, 1);
 
                hbox->Add(fgsizer, 1, wxALL | wxEXPAND, 15);
-               panel->SetSizer(hbox);
+               panel->SetSizerAndFit(hbox);
                Centre();
 
                ShowModal();