final fixes to [a-b]*h headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/animate.h b/include/wx/animate.h
index ff555336b813a4289b43819f5b8060500d0a9b4e..27f37a3b803cfb576e69be531cd5c868b080a282 100644 (file)
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -65,7 +65,7 @@ protected:
 
 // default style does not include wxAC_NO_AUTORESIZE, that is, the control
 // auto-resizes by default to fit the new animation when SetAnimation() is called
-#define wxAC_DEFAULT_STYLE       (wxNO_BORDER)
+#define wxAC_DEFAULT_STYLE       (wxBORDER_NONE)
 
 class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
 {

diff --git a/interface/bitmap.h b/interface/bitmap.h
index 1de90974addef1c5563a4a815330e09dbc2b1409..8656ae698357535d7be249e86b4bdcb19224e666 100644 (file)
--- a/interface/bitmap.h
+++ b/interface/bitmap.h
@@ -95,6 +95,10 @@ public:
             The meaning of name is determined by the type parameter.
         @param type
             See ::wxBitmapType for values this can take.
+        @param desiredWidth
+            The desired width for the loaded bitmap.
+        @param desiredHeight
+            The desired height for the loaded bitmap.
 
         @returns @true if the operation succeeded, @false otherwise.
 
@@ -120,7 +124,7 @@ public:
         @see wxBitmap::LoadFile, wxBitmap::SaveFile, LoadFile()
     */
     virtual bool SaveFile(const wxBitmap* bitmap, const wxString& name, wxBitmapType type,
-                          wxPalette* palette = NULL) const;
+                          const wxPalette* palette = NULL) const;
 
     /**
         Sets the handler extension.

diff --git a/interface/button.h b/interface/button.h
index 5cc9bad0f732c65b8d7891491eadacde9ff1fe9f..ac8bb1d0224d19f7a0111cb12a3f96034f227d83 100644 (file)
--- a/interface/button.h
+++ b/interface/button.h
@@ -120,7 +120,8 @@ public:
     wxString GetLabel() const;
 
     /**
-        This sets the button to be the default item for the panel or dialog box.
+        This sets the button to be the default item in its top-level window
+        (e.g. the panel or the dialog box containing it).
 
         As normal, pressing return causes the default button to be depressed when
         the return key is pressed.
@@ -129,8 +130,10 @@ public:
         and text panel items, and wxTopLevelWindow::SetDefaultItem().
 
         @remarks Under Windows, only dialog box buttons respond to this function.
+
+        @returns the old default item (possibly NULL)
     */
-    void SetDefault();
+    virtual wxWindow* SetDefault();
 
     /**
         Sets the string label for the button.