Changeset 737

Show
Ignore:
Timestamp:
01/28/04 19:22:42 (4 years ago)
Author:
sholloway
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBSkinning/RBSkinning/wxPythonSkin/pycrust.py

    r634 r737  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
     26from wxPython.py import crust 
    2627from wxSkinLayoutObject import wx, wxSkinLayoutObject, wxSkinObjectNoData 
    27 try: 
    28     from wx.py import crust 
    29 except ImportError: 
    30     from wxPython.lib.PyCrust import crust 
     28 
     29assert hasattr(crust, 'Crust'), "PyCrust.crust module has no attribute \"Crust\"!" 
    3130 
    3231#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBSkinning/RBSkinning/wxPythonSkin/pycrust_filling.py

    r634 r737  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
     26from wxPython.py import filling 
    2627from wxSkinLayoutObject import wx, wxSkinLayoutObject, wxSkinObjectNoData 
    27 try: 
    28     from wx.py import filling 
    29 except ImportError: 
    30     from wxPython.lib.PyCrust import filling 
     28 
     29assert hasattr(filling, 'Filling'), "PyCrust.filling module has no attribute \"Filling\"!" 
    3130 
    3231#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBSkinning/RBSkinning/wxPythonSkin/pycrust_shell.py

    r634 r737  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
     26from wxPython.py import shell 
    2627from wxSkinLayoutObject import wx, wxSkinLayoutObject, wxSkinObjectNoData 
    27 try: 
    28     from wx.py import shell 
    29 except ImportError: 
    30     from wxPython.lib.PyCrust import shell 
     28 
     29assert hasattr(shell, 'Shell'), "PyCrust.shell module has no attribute \"Shell\"!" 
    3130 
    3231#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBSkinning/RBSkinning/wxTools/wxMenuBuilder.py

    r724 r737  
    5151    uncheckedbmp = wx.wxNullBitmap 
    5252 
    53     def __init__(self, label, help=None, accel=None, checkedbmp=None, uncheckedbmp=None): 
     53    def __init__(self, label, help=None, accel=None, checkedbmp=None, uncheckedbmp=None, **kw): 
    5454        MenuItemBase.__init__(self) 
    5555        self.SetLabel(label) 
    5656        self.SetHelp(accel) 
    5757        self.SetAccel(accel) 
     58        if 'bitmap' in kw: 
     59            if checkedbmp is not None:  
     60                raise ValueError, 'Both bitmap and checkedbmp were specified, conflicting arguments.' 
     61            if uncheckedbmp  is not None:  
     62                raise ValueError, 'Both bitmap and uncheckedbmp were specified, conflicting arguments.' 
     63            checkedbmp = uncheckedbmp = kw['bitmap'] 
    5864        self.SetBitmaps(checkedbmp, uncheckedbmp) 
    5965 
    …… 
    296302        result.SetSubMenu(submenu) 
    297303        return result 
     304 
    298305GroupMenuItem = Menu 
    299306 
    300 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    301 #~ Main  
    302 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    303  
    304 if __name__=='__main__': 
    305     pass 
    306  

  • trunk/RBSkinning/demo/wxPythonSkin/widgets/popupmenu.py

    r647 r737  
    3636    <frame show='True' size='300,300'> 
    3737        <panel> 
    38             <label pos='10,10'>Right click for a popup menu</label> 
     38            <label pos='10,10'>Right click for a popup menu<event type='EVT_RIGHT_DOWN' call='ctx.behavior.OnShowPopup' /></label> 
    3939            <event type='EVT_RIGHT_DOWN' call='ctx.behavior.OnShowPopup' /> 
    4040        </panel>