Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / gtk / colordlg.h

diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h
index 121477410fece60a16e957dec24f297729b51f45..a1fdbb75ec7c64c6aaadedf1469554e74fc67410 100644 (file)
--- a/include/wx/gtk/colordlg.h
+++ b/include/wx/gtk/colordlg.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/06/04
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/06/04

-// RCS-ID:      $Id$

 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,17 +12,16 @@
 #define _WX_GTK_COLORDLG_H_
 
 #include "wx/dialog.h"
 #define _WX_GTK_COLORDLG_H_
 
 #include "wx/dialog.h"

-#include "wx/cmndata.h"

 
 

-class WXDLLEXPORT wxColourDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog

 {
 public:
     wxColourDialog() {}
     wxColourDialog(wxWindow *parent,
 {
 public:
     wxColourDialog() {}
     wxColourDialog(wxWindow *parent,

-                   wxColourData *data = (wxColourData *)NULL);
+                   wxColourData *data = NULL);

     virtual ~wxColourDialog() {}
 
     virtual ~wxColourDialog() {}
 

-    bool Create(wxWindow *parent, wxColourData *data = (wxColourData *)NULL);
+    bool Create(wxWindow *parent, wxColourData *data = NULL);

 
     wxColourData &GetColourData() { return m_data; }
 
 
     wxColourData &GetColourData() { return m_data; }