gnue/forms/src/uidrivers/wx/widgets/form wrappe...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/03 12:00:53

Modified files:
        forms/src/uidrivers/wx/widgets/form: wrappers.py 

Log message:
        grrrr.... wx2.2 ('nuf said)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.4 
gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.5
*** gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.4    Mon Mar  3 
11:31:11 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py        Mon Mar  3 
12:00:52 2003
***************
*** 33,38 ****
--- 33,46 ----
  from gnue.forms.uidrivers.wx.common import *
  
  from wxPython.wx import *
+ from wxPython.wx import __version__ as wxversion
+ 
+ # How sad...
+ if wxversion[:3] == '2.2': 
+   USING_WX_22 = 1
+ else: 
+   USING_WX_22 = 0
+ 
  
  class ScrollableWrapper(wxScrolledWindow): 
    def __init__(self, uiform): 
***************
*** 55,61 ****
      try: 
        self.SetVirtualSize(self.pane.GetSize())
      except AttributeError: 
-       self.SetSize(self.pane.GetSize())
        pass # Yes, it is more wx2.2 goodness!!
      tempx,tempy =  self.pane.GetSizeTuple()
      self.Show(1)
--- 63,68 ----
***************
*** 113,123 ****
      if self._fitted: return
      self.notebooksizer.Layout()
      self.notebooksizer.SetSizeHints(self.pane)
-     self.SetClientSize(self.pane.GetSize())    
      self.SetClientSize(self.layoutSize)    
!     self.SetSize(self.pane.GetSize())
      self.frame.SetClientSize(self.GetSize())
      self._fitted = 1
    
    def notebookTabHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
--- 120,136 ----
      if self._fitted: return
      self.notebooksizer.Layout()
      self.notebooksizer.SetSizeHints(self.pane)
      self.SetClientSize(self.layoutSize)    
!     if not USING_WX_22: 
!       self.SetSize(self.pane.GetSize())
!     else: 
!       # TODO: How fscking sad to have to do this.
!       # TODO: but, I can't get wx 2.2 to cooperate
!       w,h = self.GetClientSizeTuple()
!       self.SetSize(wxSize(w+20, h+50))
      self.frame.SetClientSize(self.GetSize())
      self._fitted = 1
+ 
    
    def notebookTabHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING: