← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to samples/xrc/rc/controls.xrc

  • Committer: Package Import Robot
  • Author(s): Olly Betts, Olly Betts, Christian Beier
  • Date: 2014-10-07 13:12:10 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20141007131210-3oyq1x092j6fd8ib
Tags: 3.0.2-1
http://bugs.debian.org/762134
http://bugs.debian.org/745887
[ Olly Betts ]

* New upstream release:
  - wxTR_EDIT_LABELS now works again.  (Closes: #762134)
* Disable gcc4.9-workaround.patch, as GCC is now fixed in jessie and this
  bug is new in 4.9 so wheezy was never affected.

[ Christian Beier ]

* debian/control.in: Add BD on libnotify-dev to enable use of libnotify.
  (Closes: #745887)

Show diffs side-by-side

added added

removed removed

Lines of Context:
samples/xrc/rc/controls.xrc
1044
1044
                    <label>wxTextCtrl</label>
1045
1045
                    <object class="wxPanel" name="textctrl">
1046
1046
                        <object class="wxFlexGridSizer">
1047
 
                            <cols>2</cols>
 
1047
                            <cols>4</cols>
1048
1048
                            <rows>0</rows>
1049
1049
                            <vgap>0</vgap>
1050
1050
                            <hgap>0</hgap>
1068
1068
                            <object class="sizeritem">
1069
1069
                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
1070
1070
                                <border>5</border>
 
1071
                                <object class="wxStaticText">
 
1072
                                    <label>With a _hint:</label>
 
1073
                                </object>
 
1074
                            </object>
 
1075
                            <object class="sizeritem">
 
1076
                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
 
1077
                                <border>5</border>
 
1078
                                <object class="wxTextCtrl">
 
1079
                                    <size>180,-1</size>
 
1080
                                    <hint>you@some.whe.re</hint>
 
1081
                                </object>
 
1082
                            </object>
 
1083
                            <object class="sizeritem">
 
1084
                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
 
1085
                                <border>5</border>
1071
1086
                                <object class="wxStaticText" name="controls_textctrl2_statictext">
1072
1087
                                    <label>Password:</label>
1073
1088
                                </object>
1084
1099
                            <object class="sizeritem">
1085
1100
                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
1086
1101
                                <border>5</border>
 
1102
                                <object class="wxStaticText" name="controls_textctrl4_statictext">
 
1103
                                    <label>Search for:</label>
 
1104
                                </object>
 
1105
                            </object>
 
1106
                            <object class="sizeritem">
 
1107
                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
 
1108
                                <border>5</border>
 
1109
                                <object class="wxSearchCtrl" name="controls_multiline_searchctrl">
 
1110
                                    <size>180,-1</size>
 
1111
                                    <value>true love</value>
 
1112
                                </object>
 
1113
                            </object>
 
1114
                            <object class="sizeritem">
 
1115
                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
 
1116
                                <border>5</border>
1087
1117
                                <object class="wxStaticText" name="controls_textctrl3_statictext">
1088
1118
                                    <label>Multiline:</label>
1089
1119
                                </object>
1097
1127
                                    <value>"So many pretty widgets" said Pooh, said he. "So many pretty widgets", said Pooh.</value>
1098
1128
                                </object>
1099
1129
                            </object>
1100
 
                            <object class="sizeritem">
1101
 
                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
1102
 
                                <border>5</border>
1103
 
                                <object class="wxStaticText" name="controls_textctrl4_statictext">
1104
 
                                    <label>Search for:</label>
1105
 
                                </object>
1106
 
                            </object>
1107
 
                            <object class="sizeritem">
1108
 
                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
1109
 
                                <border>5</border>
1110
 
                                <object class="wxSearchCtrl" name="controls_multiline_searchctrl">
1111
 
                                    <size>180,-1</size>
1112
 
                                    <value>true love</value>
1113
 
                                </object>
1114
 
                            </object>
1115
1130
                        </object>
1116
1131
                    </object>
1117
1132
                </object>