thr3ads.net - wxruby development - [Wxruby-development] [864] trunk/wxruby2/samples/calendar/calendar.rb: Fix a couple of errors, add a note on CalendarDateAttr [Feb 2007]

If this information is useful, please help other people find it:
Share via:

nobody at rubyforge.org

2007-Feb-12 19:13 UTC

[Wxruby-development] [864] trunk/wxruby2/samples/calendar/calendar.rb: Fix a couple of errors, add a note on CalendarDateAttr

<!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>[864] trunk/wxruby2/samples/calendar/calendar.rb: Fix a couple of
errors, add a note on CalendarDateAttr</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>864</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-02-12 14:13:16 -0500 (Mon, 12 Feb
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix a couple of errors, add a note on CalendarDateAttr</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 (863 => 864)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/samples/calendar/calendar.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-02-12
18:44:47 UTC (rev 863)
+++
trunk/wxruby2/samples/calendar/calendar.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-02-12
19:13:16 UTC (rev 864)
</span><span class="lines">@@ -33,14 +33,14 @@
</span><span class="cx"> end
</span><span class="cx"> 
</span><span class="cx"> class MyCalendar <
CalendarCtrl
</span><del>-    def initialize(parent, initial_date,
calendar_flags)
</del><ins>+    def initialize(parent, display_frame, initial_date,
calendar_flags)
</ins><span class="cx">         super(parent, -1, 
</span><span class="cx">                     initial_date,
</span><span class="cx">                    
DEFAULT_POSITION,
</span><span class="cx">                     DEFAULT_SIZE,
</span><span class="cx">                    
calendar_flags | RAISED_BORDER)
</span><span class="cx"> 
</span><del>-        @parent = parent
</del><ins>+        @display = display_frame
</ins><span class="cx">         @date = initial_date
</span><span class="cx">         @weekday_names =
[''Sun'', ''Mon'', ''Tue'',
''Wed'', ''Thu'', ''Fri'',
''Sat'']
</span><span class="cx"> 
</span><span class="lines">@@ -54,8 +54,7 @@
</span><span class="cx"> 
</span><span class="cx">   def on_calendar(event)
</span><span class="cx">         @date = event.get_date
</span><del>-        log_message("Double-clicked
#{format_date(@date)}")
-        @parent.set_date(@date)
</del><ins>+        @display.set_date(@date)
</ins><span class="cx">     end
</span><span class="cx"> 
</span><span class="cx">   def on_calendar_change(event)
</span><span class="lines">@@ -89,7 +88,7 @@
</span><span class="cx">         @calendar_flags =
CAL_MONDAY_FIRST | CAL_SHOW_HOLIDAYS
</span><span class="cx"> 
</span><span class="cx">         now = DateTime.now
</span><del>-        @calendar = MyCalendar.new(@panel, now,
@calendar_flags)
</del><ins>+        @calendar = MyCalendar.new(@panel, self, 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">@@ -232,7 +231,7 @@
</span><span class="cx">         else
</span><span class="cx">             style &= ~flag
</span><span class="cx">         end
</span><del>-      @calendar = MyCalendar.new(self, date, style)
</del><ins>+      @calendar = MyCalendar.new(@panel, self, date,
style)
</ins><span class="cx">       @sizer.add(@calendar, 0,
Wx::ALIGN_CENTRE|Wx::ALL, 5)
</span><span class="cx">       layout
</span><span class="cx">     end
</span><span class="lines">@@ -241,21 +240,26 @@
</span><span class="cx">         if on
</span><span class="cx">       attr_red_circle =
CalendarDateAttr.new(CAL_BORDER_ROUND, RED)
</span><span class="cx">       attr_green_square =
CalendarDateAttr.new(CAL_BORDER_SQUARE, GREEN)
</span><del>-#     attr_header_like = CalendarDateAttr.new(BLUE,
LIGHT_GREY)
</del><ins>+      # This wraps correctly, but causes problems
because the colour is freed
+      # when the attribute is reset.
+      #
+      # attr_header_like = CalendarDateAttr.new(BLUE, LIGHT_GREY)
</ins><span class="cx"> 
</span><span class="cx">       @calendar.set_attr(17,
attr_red_circle)
</span><span class="cx">       @calendar.set_attr(29,
attr_green_square)
</span><del>-#     @calendar.set_attr(13, attr_header_like)
</del><ins>+      # @calendar.set_attr(13, attr_header_like)
</ins><span class="cx">         else
</span><span class="cx">       @calendar.reset_attr(17)
</span><span class="cx">       @calendar.reset_attr(29)
</span><del>-      @calendar.reset_attr(13)
</del><ins>+      # @calendar.reset_attr(13)
</ins><span class="cx">         end
</span><span class="cx">     @calendar.refresh()
</span><span class="cx">     end
</span><span class="cx"> 
</span><span class="cx">     def set_date(d)
</span><del>-    @date.set_label(format_date(d))
</del><ins>+      str = "%s-%s-%s" % [ d.year, d.mon,
d.day ]
+      Wx::MessageDialog.new( self, "The selected date is #{str}", 
+                             "Date chosen" ).show_modal
</ins><span class="cx">     end
</span><span class="cx">     
</span><span class="cx"> end
</span></span></pre>
</div>
</div>

</body>
</html>

Reasonably Related Threads

Search for more reasonably related threads

wxruby development - Feb 2007 - [864] trunk/wxruby2/samples/calendar/calendar.rb: Fix a couple of errors, add a note on CalendarDateAttr

[Wxruby-development] [864] trunk/wxruby2/samples/calendar/calendar.rb: Fix a couple of errors, add a note on CalendarDateAttr

Reasonably Related Threads

Wisdom of the Ancients