#3132 bbGEditor Feature New Normal - branch changeWx28to30 compilation with wxWidgets3

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / bbtkwxGUIEditorGraphicBBS.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index b5355ea108a2b0c4456c7b1e938f5ddcb078174a..4b9c0e5f0abcaefa0877995d2aff861386b46297 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -122,7 +122,8 @@ wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS()
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::initToolbar() {
+void wxGUIEditorGraphicBBS::initToolbar() 
+{
        wxBitmap bmp_new(new_xpm);
        wxBitmap bmp_open(open_xpm);
        wxBitmap bmp_save(save_xpm);
@@ -143,8 +144,10 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        //Adds a tool btn to the toolbar
        toolbar->AddTool(ID_NEW, _T("New"), bmp_new, wxNullBitmap, wxITEM_NORMAL,
                        _T("New tab"), _T("Create a new panel tab"));
+
        toolbar->AddTool(ID_OPEN, _T("Open diagram"), bmp_open, wxNullBitmap,
                        wxITEM_NORMAL, _T("Open a diagram"), _T("Open a diagram"));
+
        toolbar->AddTool(ID_SAVE_DIAGRAM, _T("Save Diagram"), bmp_save,
                        wxNullBitmap, wxITEM_NORMAL, _T("Saves the current diagram"),
                        _T("Saves the current diagram")); //DFCH
@@ -165,7 +168,14 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->AddSeparator();
        toolbar->AddTool(ID_BTNCOMPLEXBOX, _T("Complex box"), complexbox_xpm,
                        wxNullBitmap, wxITEM_NORMAL, _T("Complex box"), _T("Complex box"));
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        toolbar->SetToggle(ID_BTNCOMPLEXBOX, true);
+#else
+       printf ("EED Warnning. wxGUIEditorGraphicBBS::initToolbar       >>>   toolbar->SetToggle  \n ");
+       // ..
+#endif
 
        // RaC 2012 2nd HackFest - Now Complex inputs are any external input
        //              toolbar->AddTool(ID_ADDCOMPLEXBOXINPUT, _T("Add input to Complex box"),
@@ -191,6 +201,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->EnableTool(ID_EDITPROPERTIES, false);
 
        toolbar->AddTool(ID_SHOWTREE, _T("Show tree"),bmp_showTree, wxNullBitmap, wxITEM_NORMAL,        _T("Show tree"), _T("Show tree"));
+
        
        toolbar->EnableTool(ID_UNDO, false);
        toolbar->EnableTool(ID_REDO, false);
@@ -198,6 +209,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->Realize();
        SetToolBar(toolbar);
 
+
        
        // connect command event handlers
 
@@ -239,6 +251,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        Connect(ID_EDITPROPERTIES,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
        Connect(ID_SHOWTREE,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnShowTree));
 
+
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::initHelpHTMLBrowser() {