Feature #2006 Black Box for BitmapButtons

Change to show label and bitmapbutton

diff --git a/packages/wx/src/bbwxBitmapButton.cxx b/packages/wx/src/bbwxBitmapButton.cxx
index 652ac4fa742f58dc8f783a52ad3c77b58582bf6c..d2aba4785ddcee44216530cd5ba48a4fa44d0dc5 100644 (file)
--- a/packages/wx/src/bbwxBitmapButton.cxx
+++ b/packages/wx/src/bbwxBitmapButton.cxx
@@ -99,25 +99,28 @@ namespace bbwx
     ) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
       box(bx)
   { 
-
+    this->title = title;
     wxPanel* panel  = this;
     sizer = new wxBoxSizer(wxHORIZONTAL);
     
     if(bitmap != NULL)
     {
       button = new wxBitmapButton(panel, -1, *bitmap, wxDefaultPosition, wxSize(bitmap->GetWidth(),bitmap->GetHeight()));
-      std::cout << "Size: " << bitmap->GetWidth() << " " << bitmap->GetHeight() << std::endl;
+
+      sizer -> Add(button, 0, wxALL | wxALIGN_CENTER, 3);
+      sizer -> Add(new wxStaticText(panel,-1,title), 0, wxALL | wxALIGN_CENTER, 3);  
     }
     else
     {
       button = new wxButton( panel, -1, title);
+      sizer -> Add(button,1,wxEXPAND | wxALL | wxALIGN_CENTER, 5); 
     }
     Connect( button->GetId(),   wxEVT_COMMAND_BUTTON_CLICKED , 
        (wxObjectEventFunction) 
        (void (wxPanel::*)(wxEvent&))
        &BitmapButtonWidget::OnClick ); 
     
-    sizer -> Add(button,1,wxEXPAND | wxALL, 5); 
+    
     
     panel -> SetSizer(sizer);
     sizer->Fit(panel);
@@ -210,7 +213,7 @@ namespace bbwx
     if(bitmap != NULL)
     {
       wxPanel* panel  = this;
-      sizer->Remove(0);
+      sizer->Clear();
       button->Destroy();
 
       button = new wxBitmapButton(panel, -1, *bitmap, wxDefaultPosition, wxSize(bitmap->GetWidth(),bitmap->GetHeight()));
@@ -220,7 +223,8 @@ namespace bbwx
        (void (wxPanel::*)(wxEvent&))
        &BitmapButtonWidget::OnClick ); 
       
-      sizer->Add(button, 0, wxALL, 5);
+      sizer->Add(button, 0, wxALL | wxALIGN_CENTER, 3);
+      sizer -> Add(new wxStaticText(panel,-1,title), 0, wxALL | wxALIGN_CENTER, 3);  
       sizer->RecalcSizes();
     }
   }

diff --git a/packages/wx/src/bbwxBitmapButton.h b/packages/wx/src/bbwxBitmapButton.h
index a1bdb26e437c6dbfd058557913d759faa684c8d2..13d8da553c4fae4d1f210a723780fbd0673fd553 100644 (file)
--- a/packages/wx/src/bbwxBitmapButton.h
+++ b/packages/wx/src/bbwxBitmapButton.h
@@ -51,6 +51,7 @@ namespace bbwx
     BitmapButton* box;
     wxBoxSizer* sizer;
     wxButton  * button;
+    wxString title;
   };
 
   typedef std::vector<double> colorVector;