allocate size for the extra controls in the file dialog (#9679)

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 84da1edd65a39344f7501659d5b04f6289e03567..3a626d5a881e61524180686bd9d23c25c02b1271 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1037,8 +1037,8 @@ public:
         // font
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
+                               int *descent = NULL,
+                               int *externalLeading = NULL,
                                const wxFont *theFont = (const wxFont *) NULL)
                                const = 0;
 
@@ -1141,7 +1141,7 @@ public:
 
         // scroll window to the specified position
     virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL ) = 0;
+                               const wxRect* rect = NULL ) = 0;
 
         // scrolls window by line/page: note that not all controls support this
         //
@@ -1402,7 +1402,8 @@ protected:
     void SatisfyConstraints();
 #endif // wxUSE_CONSTRAINTS
 
-    // Send the wxWindowDestroyEvent
+    // Send the wxWindowDestroyEvent if not done yet and sets m_isBeingDeleted
+    // to true
     void SendDestroyEvent();
 
     // returns the main window of composite control; this is the window
@@ -1791,7 +1792,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
 
 inline wxWindow *wxWindowBase::GetGrandParent() const
 {
-    return m_parent ? m_parent->GetParent() : (wxWindow *)NULL;
+    return m_parent ? m_parent->GetParent() : NULL;
 }
 
 // ----------------------------------------------------------------------------