Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3748/src/gui
Modified Files:
wxDialogLayout.cpp
Log Message:
added a CreateMessageFor() function allowing to use arbitrary columns in
standard 2-column dialog layout
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -b -u -2 -r1.122 -r1.123
--- wxDialogLayout.cpp 28 May 2006 02:30:33 -0000 1.122
+++ wxDialogLayout.cpp 26 Jun 2006 23:30:17 -0000 1.123
@@ -207,10 +207,10 @@
}
-wxTextCtrl *CreateTextWithLabel(wxWindow *parent,
+wxStaticText *CreateMessageForControl(wxWindow *parent,
+ wxWindow *control,
const wxChar *label,
long widthMax,
wxControl *last,
- wxCoord nRightMargin,
- int style)
+ wxCoord nRightMargin)
{
wxLayoutConstraints *c;
@@ -227,5 +227,5 @@
pLabel->SetConstraints(c);
- // for the text control
+ // for the control
c = new wxLayoutConstraints;
c->centreY.SameAs(pLabel, wxCentreY);
@@ -233,9 +233,22 @@
c->right.SameAs(parent, wxRight, LAYOUT_X_MARGIN + nRightMargin);
c->height.AsIs();
- wxTextCtrl *pText = new wxTextCtrl(parent, -1, wxEmptyString,
wxDefaultPosition,
- wxDefaultSize, style);
- pText->SetConstraints(c);
+ control->SetConstraints(c);
+
+ return pLabel;
+}
+
+wxTextCtrl *CreateTextWithLabel(wxWindow *parent,
+ const wxChar *label,
+ long widthMax,
+ wxControl *last,
+ wxCoord nRightMargin,
+ int style)
+{
+ wxTextCtrl *text = new wxTextCtrl(parent, -1, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize, style);
- return pText;
+ CreateMessageForControl(parent, text, label, widthMax, last, nRightMargin);
+
+ return text;
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates