Added some more docstrings, and also a few little tweaks along the way.

[wxWidgets.git] / wxPython / src / msw / controls.py

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index 1a22d5cfbd6a895f73b8b41e70df05895157aff9..1ee35df06695e08f7f1eb74cb22aa69da28dfb57 100644 (file)
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -53,14 +53,6 @@ class Button(core.Control):
         """
         return _controls.Button_SetDefault(*args, **kwargs)
 
         """
         return _controls.Button_SetDefault(*args, **kwargs)
 

-    def SetImageLabel(*args, **kwargs):
-        """SetImageLabel(Bitmap bitmap)"""
-        return _controls.Button_SetImageLabel(*args, **kwargs)
-
-    def SetImageMargins(*args, **kwargs):
-        """SetImageMargins(int x, int y)"""
-        return _controls.Button_SetImageMargins(*args, **kwargs)
-

     def GetDefaultSize(*args, **kwargs):
         """GetDefaultSize() -> Size"""
         return _controls.Button_GetDefaultSize(*args, **kwargs)
     def GetDefaultSize(*args, **kwargs):
         """GetDefaultSize() -> Size"""
         return _controls.Button_GetDefaultSize(*args, **kwargs)


@@ -91,7 +83,13 @@ def Button_GetDefaultSize(*args, **kwargs):
     return _controls.Button_GetDefaultSize(*args, **kwargs)
 
 class BitmapButton(Button):
     return _controls.Button_GetDefaultSize(*args, **kwargs)
 
 class BitmapButton(Button):

-    """A Buttont that contains a bitmap."""
+    """
+    A Button that contains a bitmap.  A bitmap button can be supplied with a
+    single bitmap, and wxWindows will draw all button states using this bitmap. If
+    the application needs more control, additional bitmaps for the selected state,
+    unpressed focused state, and greyed-out state may be supplied.
+
+    """

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -101,7 +99,7 @@ class BitmapButton(Button):
             Validator validator=DefaultValidator, 
             String name=ButtonNameStr) -> BitmapButton
 
             Validator validator=DefaultValidator, 
             String name=ButtonNameStr) -> BitmapButton
 

-        Create and show a button.
+        Create and show a button with a bitmap for the label.

         """
         newobj = _controls.new_BitmapButton(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_BitmapButton(*args, **kwargs)
         self.this = newobj.this