Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13184
Modified Files:
Images.cpp SBPanel.cpp
Log Message:
Fixes wxMac, wxGTK and wxX11 issues.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Images.cpp 20 Dec 2003 03:37:26 -0000 1.35
+++ Images.cpp 21 Dec 2003 03:45:35 -0000 1.36
@@ -316,6 +316,9 @@
wxBitmap tmp, tmp_new;
int x, y;
+ tmp_new = wxBitmap(tool_img_width, tool_img_height);
+ mdc.SelectObject(tmp_new);
+
mdc.SetTextForeground(wxColour(10, 10, 10));
#ifdef __WXMAC__
mdc.SetFont(wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL));
@@ -323,9 +326,6 @@
mdc.SetFont(wxFont(10, wxDECORATIVE, wxNORMAL, wxBOLD));
#endif
- tmp_new = wxBitmap(tool_img_width, tool_img_height);
-
- mdc.SelectObject(tmp_new);
mdc.BeginDrawing();
#ifdef __WXMSW__ /* This gives transparent image on wxMSW */
mdc.SetPen(*wxTRANSPARENT_PEN);
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SBPanel.cpp 20 Dec 2003 03:39:27 -0000 1.6
+++ SBPanel.cpp 21 Dec 2003 03:45:35 -0000 1.7
@@ -54,7 +54,11 @@
headerbtn = new wxButton(
this, -1, title, wxDefaultPosition, wxDefaultSize, 0
);
+#if defined(__WXMSW__)
headerbtn->SetFont(wxFont(10, wxROMAN, wxNORMAL, wxBOLD));
+#else
+ headerbtn->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxBOLD));
+#endif
mainsizer->Add(headerbtn, 0, wxGROW|wxADJUST_MINSIZE, 5);
SetAutoLayout(true);
|
