|
From: <ma...@us...> - 2003-12-22 12:06:29
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27488
Modified Files:
MBitmapButton.cpp MMultiButton.cpp SBPanel.cpp
Log Message:
Line length fix
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MBitmapButton.cpp 22 Dec 2003 11:56:02 -0000 1.4
+++ MBitmapButton.cpp 22 Dec 2003 12:06:23 -0000 1.5
@@ -132,10 +132,15 @@
#endif
mdc.DrawRectangle(0, 0, tmp->GetWidth(), tmp->GetHeight());
- mdc.DrawBitmap(image, 5, ((y-image.GetHeight())/2)+BITMAP_Y_POS_OFFSET, true);
+ mdc.DrawBitmap(
+ image, 5, ((y-image.GetHeight())/2)+BITMAP_Y_POS_OFFSET, true
+ );
mdc.SetTextForeground(wxColour(1, 1, 1));
- mdc.DrawText(name, image.GetWidth()+10, ((tmp->GetHeight()-GetCharHeight())/2)+TEXT_Y_POS_OFFSET);
+ mdc.DrawText(
+ name, image.GetWidth()+10,
+ ((tmp->GetHeight()-GetCharHeight())/2)+TEXT_Y_POS_OFFSET
+ );
#ifndef __WXMSW__
tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
Index: MMultiButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MMultiButton.cpp 22 Dec 2003 10:07:37 -0000 1.2
+++ MMultiButton.cpp 22 Dec 2003 12:06:23 -0000 1.3
@@ -52,8 +52,8 @@
/* @style Style flag - see wxWindow/wxControl style flags in wxHelp */
/******************************************************************************/
MMultiButton::MMultiButton(
- wxWindow *parent, wxWindowID id, size_t count, const wxArrayString &names,
- int ids[], const wxPoint &pos, const wxSize &size, long style
+ wxWindow *parent, wxWindowID id, size_t count, const wxArrayString
+ &names, int ids[], const wxPoint &pos, const wxSize &size, long style
) : wxControl(parent, id, pos, size, style) {
wxASSERT(count <= names.GetCount());
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- SBPanel.cpp 22 Dec 2003 10:07:37 -0000 1.11
+++ SBPanel.cpp 22 Dec 2003 12:06:23 -0000 1.12
@@ -59,7 +59,8 @@
if (use_image) {
MBitmapButton *headerbmpbtn = new MBitmapButton(
- this, -1, title, image, wxDefaultPosition, wxDefaultSize, wxNO_BORDER
+ this, -1, title, image, wxDefaultPosition,
+ wxDefaultSize, wxNO_BORDER
);
headerbmpbtn->SetFont(
wxFont(SB_BTN_FONT_SIZE, wxROMAN, wxNORMAL, wxBOLD)
@@ -81,7 +82,7 @@
SetSizer(mainsizer);
mainsizer->Fit(this);
mainsizer->SetSizeHints(this);
-
+
shown = false;
}
|