Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8638
Modified Files:
MBitmapButton.cpp MMultiButton.cpp SBPanel.cpp
Log Message:
GUI fixed for wxGTK - looks awesome (imho) :P
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MBitmapButton.cpp 22 Dec 2003 09:52:58 -0000 1.2
+++ MBitmapButton.cpp 22 Dec 2003 10:07:37 -0000 1.3
@@ -141,7 +141,7 @@
tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
#endif
SetBitmapLabel(*tmp);
- SetSize(wxSize(tmp->GetWidth()+5, tmp->GetHeight()+5));
+ SetSize(wxSize(tmp->GetWidth()+10, tmp->GetHeight()+5));
delete tmp;
}
Index: MMultiButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MMultiButton.cpp 22 Dec 2003 05:04:15 -0000 1.1
+++ MMultiButton.cpp 22 Dec 2003 10:07:37 -0000 1.2
@@ -99,7 +99,10 @@
wxFlexGridSizer *s_main = new wxFlexGridSizer(1);
s_main->AddGrowableCol(0);
for (size_t i=0;i<count;i++) {
- btn = new MBitmapButton(this, ids[i], names[i], *(images.Item(i)->GetData()));
+ btn = new MBitmapButton(
+ this, ids[i], names[i], *(images.Item(i)->GetData()),
+ wxDefaultPosition, wxDefaultSize, style
+ );
s_main->Add(btn, 0, wxGROW, 0);
}
SetBackgroundColour(parent->GetBackgroundColour());
@@ -107,7 +110,6 @@
SetAutoLayout(true);
s_main->Fit(this);
s_main->SetSizeHints(this);
- Fit();
Layout();
}
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SBPanel.cpp 22 Dec 2003 05:36:15 -0000 1.10
+++ SBPanel.cpp 22 Dec 2003 10:07:37 -0000 1.11
@@ -59,7 +59,7 @@
if (use_image) {
MBitmapButton *headerbmpbtn = new MBitmapButton(
- this, -1, title, image
+ this, -1, title, image, wxDefaultPosition, wxDefaultSize, wxNO_BORDER
);
headerbmpbtn->SetFont(
wxFont(SB_BTN_FONT_SIZE, wxROMAN, wxNORMAL, wxBOLD)
|
