[gnue] r10303 - in trunk/gnue-forms: . src/uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2011-03-04 10:15:48 -0600 (Fri, 04 Mar 2011)
New Revision: 10303

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/uidrivers/wx/widgets/form.py
Log:
Fix to form printout.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2011-03-02 20:06:01.614000082 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2011-03-04 17:13:44.269999981 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/uidrivers/wx/widgets/button.py 
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fbutton.py

   + src/uidrivers/wx/widgets/form.py   
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fform.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden
3173 address@hidden
3174 address@hidden
3175 address@hidden
3176 address@hidden
3177 address@hidden
3178 address@hidden
3179 address@hidden
3180 address@hidden
3181 address@hidden
3182 address@hidden
3183 address@hidden
3184 address@hidden
3185 address@hidden
3186 address@hidden
3187 address@hidden
3188 address@hidden
3189 address@hidden
3190 address@hidden
3191 address@hidden
3192 address@hidden
3193 address@hidden
3194 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden
3173 address@hidden
3174 address@hidden
3175 address@hidden
3176 address@hidden
3177 address@hidden
3178 address@hidden
3179 address@hidden
3180 address@hidden
3181 address@hidden
3182 address@hidden
3183 address@hidden
3184 address@hidden
3185 address@hidden
3186 address@hidden
3187 address@hidden
3188 address@hidden
3189 address@hidden
3190 address@hidden
3191 address@hidden
3192 address@hidden
3193 address@hidden
3194 address@hidden
3195 address@hidden

Name: bzr:text-parents
   - src/uidrivers/wx/widgets/button.py address@hidden

   + src/uidrivers/wx/widgets/form.py   address@hidden


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form.py   2011-03-02 19:08:44 UTC 
(rev 10302)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form.py   2011-03-04 16:15:48 UTC 
(rev 10303)
@@ -651,7 +651,15 @@
         form_dc.Blit(0,0, w, h, window_dc, offsx, offsy)
 
         printout = _Printout(title, subtitle, user, bitmap)
-        wx.Printer().Print(self.main_window, printout)
+        # This should actually not be necessary because we set exactly these
+        # limits in _Printout.GetPageInfo(), but it doesn't seem to work
+        # otherwise in wx 2.8, at least not for non-Windows printing.
+        pdd = wx.PrintDialogData()
+        pdd.SetMinPage(1)
+        pdd.SetMaxPage(1)
+        pdd.SetFromPage(0)
+        pdd.SetToPage(1)
+        wx.Printer(pdd).Print(self.main_window, printout)
 
 
     # -------------------------------------------------------------------------
@@ -700,7 +708,7 @@
 
     def GetPageInfo(self):
 
-        return (1, 1, 1, 1)
+        return (1, 1, 0, 1)
 
 
     # -------------------------------------------------------------------------
@@ -776,7 +784,9 @@
         dc.DrawRectangle(x, y, w, h)
         dc.SetUserScale(1, 1)
 
+        return True
 
+
     # -------------------------------------------------------------------------
     # Draw text and calculate new y position
     # -------------------------------------------------------------------------