#3323 Bug with ToolBar (in wxFrame an not in wxPanel) in MacOs

[creaImageIO.git] / src / creaImageIOWxGimmickView.h

diff --git a/src/creaImageIOWxGimmickView.h b/src/creaImageIOWxGimmickView.h
index 62e113695fe3a7ab8d80b6e51e0af9fb072b9a24..7ea39f2e84b6d054a1c5425c3a742c33c90f9101 100644 (file)
--- a/src/creaImageIOWxGimmickView.h
+++ b/src/creaImageIOWxGimmickView.h
@@ -142,7 +142,7 @@ namespace creaImageIO
 
   protected:
     /// Creates the tool bar
-    void CreateToolBar(); 
+    void CreateToolBar( ); 
     
     /// Create the tree view for TreeHandler provided 
     /// (overloaded from GimmickView)
@@ -150,35 +150,38 @@ namespace creaImageIO
     
     
   private:
-         wxBoxSizer *mbottom_sizer;
-         wxBoxSizer    *msizer;
+       wxBoxSizer                      *mbottom_sizer;
+       wxBoxSizer                      *msizer;
     /// Is set to true at the end of constructor 
     /// (in order to lock callbacks from threaded objects or event 
     /// before everything is ok)
-    bool mConstructed;
+    bool                               mConstructed;
     /// The ToolBar and the tools
-    wxToolBar*         mToolBar;
-    wxToolBarToolBase* mToolAddFile;
-    wxToolBarToolBase* mToolAddDir;
-    wxToolBarToolBase* mToolRemove;
-    wxToolBarToolBase* mToolAddDatabase;
-    wxToolBarToolBase* mToolHelp;
-       wxToolBarToolBase* mToolSynchronize;
-       wxToolBarToolBase* mToolSettings;
-       wxToolBarToolBase* mToolTools;
+//    wxToolBar                        *mToolBar;
+    wxPanel             *mToolBar;
+    wxToolBarToolBase  *mToolAddFile;
+    wxToolBarToolBase  *mToolAddDir;
+    wxToolBarToolBase  *mToolRemove;
+    wxToolBarToolBase  *mToolAddDatabase;
+    wxToolBarToolBase  *mToolHelp;
+       wxToolBarToolBase       *mToolSynchronize;
+       wxToolBarToolBase       *mToolSettings;
+       wxToolBarToolBase       *mToolTools;
     
-    wxSplitterWindow* mSplitter;
-    wxPanel*          mBottomPanel;
-    wxStaticText *    mText;
-    wxNotebook*       mNotebook;
+    wxSplitterWindow   *mSplitter;
+    wxPanel                            *mBottomPanel;
+    wxStaticText               *mText;
+    wxNotebook                 *mNotebook;
     
     /// The list of icons 
-    wxImageList *    mIcon;
+    wxImageList                *mIcon;
     void CreateIconList();
+    void AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxString label, int idBitmap, wxString tooltip );
+
     
     boost::shared_ptr<Gimmick> mGimmick;
                
-       Listener* mListener;
+       Listener                        *mListener;
 
     /// Callback for adding files
     void OnAddFiles(wxCommandEvent& event);
@@ -247,7 +250,7 @@ namespace creaImageIO
        void ExportToStorage(const std::vector<std::string> i_filenames);
  
     /// Progress dialog
-    wxProgressDialog* mProgressDialog;
+    wxProgressDialog   *mProgressDialog;
 
     ///The selection's maximum dimension
     int mSelectionMaxDimension;
@@ -256,10 +259,10 @@ namespace creaImageIO
     int mSelectionMinDimension;
 
     ///Image previewer
-    WxViewer* mViewer;
+    WxViewer                   *mViewer;
 
     ///Currently Displayed Node
-    tree::Node* mCurImageItemToShow;
+    tree::Node                 *mCurImageItemToShow;
 
     //Pointer holders for images to be shown
        std::vector< boost::shared_ptr<ImagePointerHolder> > pointers;