don't place NULL pointers in the GDK window array in GTKGetWindow()

[wxWidgets.git] / interface / wx / generic / spinctrg.h

diff --git a/interface/wx/generic/spinctrg.h b/interface/wx/generic/spinctrg.h
index c0b7467061d3084994dc45e9641ddefe393acbfc..bccf568a54c9beb4075c56041fafcb0457341721 100644 (file)
--- a/interface/wx/generic/spinctrg.h
+++ b/interface/wx/generic/spinctrg.h
@@ -43,11 +43,11 @@ public:
         @param id
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos
         @param id
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos

-            Window position. If wxDefaultPosition is specified then a default
-        position is chosen.
+            Window position. 
+            If ::wxDefaultPosition is specified then a default position is chosen.

         @param size
         @param size

-            Window size. If wxDefaultSize is specified then a default size
-        is chosen.
+            Window size. 
+            If ::wxDefaultSize is specified then a default size is chosen.

         @param style
             Window style. See wxSpinButton.
         @param min
         @param style
             Window style. See wxSpinButton.
         @param min


@@ -76,19 +76,18 @@ public:
         Creation function called by the spin control constructor.
         See wxSpinCtrlDouble() for details.
     */
         Creation function called by the spin control constructor.
         See wxSpinCtrlDouble() for details.
     */

-    bool Create(wxWindow* parent, wxWindowID id = -1,
+    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,

                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS,
-                double min = 0, double max = 100,
+                long style = wxSP_ARROW_KEYS, double min = 0, double max = 100,

                 double initial = 0, double inc = 1,
                 double initial = 0, double inc = 1,

-                const wxString& name = _T("wxSpinCtrlDouble"));
+                const wxString& name = "wxSpinCtrlDouble");

 
     /**
         Gets the number of digits in the display.
     */
 
     /**
         Gets the number of digits in the display.
     */

-    unsigned GetDigits() const;
+    unsigned int GetDigits() const;

 
     /**
         Gets the increment value.
 
     /**
         Gets the increment value.


@@ -113,7 +112,7 @@ public:
     /**
         Sets the number of digits in the display.
     */
     /**
         Sets the number of digits in the display.
     */

-    void SetDigits(unsigned digits);
+    void SetDigits(unsigned int digits);

 
     /**
         Sets the increment value.
 
     /**
         Sets the increment value.