nobody at rubyforge.org
2006-Oct-19 17:04 UTC
[Wxruby-development] [691] trunk/wxruby2/samples/calendar/calendar.rb: Placed controls within a panel so they appear on the correct themed background
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type"
content="text/html; charset=utf-8" /><style
type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:'':'';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family:
verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;
font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding:
6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid;
padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family:
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch
.binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[691] trunk/wxruby2/samples/calendar/calendar.rb: Placed controls
within a panel so they appear on the correct themed background</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>691</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2006-10-19 13:04:29 -0400 (Thu, 19 Oct
2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Placed controls within a panel so they appear on the correct themed
background
colour on Windows; use a nicer flexible layout with some padding</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2samplescalendarcalendarrb">trunk/wxruby2/samples/calendar/calendar.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2samplescalendarcalendarrb"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/samples/calendar/calendar.rb (690 => 691)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/samples/calendar/calendar.rb        2006-10-19
16:48:19 UTC (rev 690)
+++
trunk/wxruby2/samples/calendar/calendar.rb        2006-10-19
17:04:29 UTC (rev 691)
</span><span class="lines">@@ -82,15 +82,14 @@
</span><span class="cx"> class MyFrame < Frame
</span><span class="cx"> def initialize(title)
</span><span class="cx"> super(nil, -1, title)
</span><del>-
</del><ins>+ @panel = Wx::Panel.new(self)
</ins><span class="cx"> add_menu_bar
</span><span class="cx"> add_status_bar
</span><span class="cx">
</span><span class="cx"> @calendar_flags =
CAL_MONDAY_FIRST | CAL_SHOW_HOLIDAYS
</span><span class="cx">
</span><del>- date = DateTime.now
- @date = StaticText.new(self, -1, "")
- @calendar = MyCalendar.new(self, date, @calendar_flags)
</del><ins>+ now = DateTime.now
+ @calendar = MyCalendar.new(@panel, now, @calendar_flags)
</ins><span class="cx">
</span><span class="cx"> @sizer =
BoxSizer.new(VERTICAL)
</span><span class="cx"> configure_window
</span><span class="lines">@@ -167,11 +166,11 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def configure_window
</span><del>- @sizer.add(@calendar, 0)
- @sizer.add(@date, 1)
- @sizer.set_size_hints(self)
</del><ins>+ @sizer.add(@calendar, 0,
Wx::ALIGN_CENTRE|Wx::ALL, 5)
+ @sizer.set_size_hints(@panel)
</ins><span class="cx"> layout
</span><del>- set_sizer(@sizer)
</del><ins>+ @panel.set_sizer(@sizer)
+ set_best_fitting_size
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def on_quit
</span><span class="lines">@@ -227,17 +226,15 @@
</span><span class="cx"> style =
@calendar.get_window_style_flag
</span><span class="cx"> date = @calendar.date
</span><span class="cx"> @sizer.detach(@calendar)
</span><del>- @sizer.detach(@date)
</del><span class="cx"> @calendar.destroy
</span><span class="cx"> if on
</span><span class="cx"> style |= flag
</span><span class="cx"> else
</span><span class="cx"> style &= ~flag
</span><span class="cx"> end
</span><del>- @calendar = MyCalendar.new(self, date, style)
- @sizer.add(@calendar, 0)
- @sizer.add(@date, 1)
- layout
</del><ins>+ @calendar = MyCalendar.new(self, date, style)
+ @sizer.add(@calendar, 0, Wx::ALIGN_CENTRE|Wx::ALL, 5)
+ layout
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def highlight_special(on)
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [864] trunk/wxruby2/samples/calendar/calendar.rb: Fix a couple of errors, add a note on CalendarDateAttr
- [1041] trunk/wxruby2/samples/calendar/calendar.rb: Remove deprecated call to set_best_fitting_size
- [690] trunk/wxruby2/samples/text/unicode.rb: Placed controls within a panel so they appear on the correct themed background
- [903] branches/wxruby2/wxwidgets_282/samples: Added #!/usr/bin/env ruby to the grid sample.
- [875] trunk/wxruby2/samples: Add expanded grid sample
Wisdom of the Ancients
