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

[wxWidgets.git] / interface / wx / colordlg.h

diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h
index 1ed5b25cb893119d7c46c84da6d3e3d2ae0e5133..47d8026cd475b116f885363f52b60bb9a34dc61e 100644 (file)
--- a/interface/wx/colordlg.h
+++ b/interface/wx/colordlg.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxColourDialog
 
 /**
     @class wxColourDialog

-    @wxheader{colordlg.h}

 
     This class represents the colour chooser dialog.
 
 
     This class represents the colour chooser dialog.
 


@@ -38,7 +37,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

-    ~wxColourDialog();
+    virtual ~wxColourDialog();

 
     /**
         Same as wxColourDialog().
 
     /**
         Same as wxColourDialog().


@@ -48,13 +47,13 @@ public:
     /**
         Returns the colour data associated with the colour dialog.
     */
     /**
         Returns the colour data associated with the colour dialog.
     */

-    wxColourData GetColourData();
+    wxColourData& GetColourData();

 
     /**
         Shows the dialog, returning wxID_OK if the user pressed OK, and
         wxID_CANCEL otherwise.
     */
 
     /**
         Shows the dialog, returning wxID_OK if the user pressed OK, and
         wxID_CANCEL otherwise.
     */

-    int ShowModal();
+    virtual int ShowModal();

 };
 
 
 };
 
 


@@ -63,7 +62,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

-/** @ingroup group_funcmacro_dialog */
+/** @addtogroup group_funcmacro_dialog */

 //@{
 
 /**
 //@{
 
 /**