Remove "safety margin" from wxControl::Ellipsize().

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

diff --git a/include/wx/palmos/colordlg.h b/include/wx/palmos/colordlg.h
index 227d5abf7945bce55e9a00d5c29a400cc160adca..0f59c2d60c7e8cf38f3fde0d31fc826ee1b367c1 100644 (file)
--- a/include/wx/palmos/colordlg.h
+++ b/include/wx/palmos/colordlg.h
@@ -1,30 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/colordlg.h
 // Purpose:     wxColourDialog class
-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Wlodzimierz ABX Skiba - real native implementation
 // Created:     10/13/04
-// RCS-ID:      $Id: 
-// Copyright:   (c) William Osborne
+// RCS-ID:      $Id$
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
 #include "wx/dialog.h"
-#include "wx/cmndata.h"
 
 // ----------------------------------------------------------------------------
 // wxColourDialog: dialog for choosing a colours
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColourDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
 {
 public:
     wxColourDialog();
@@ -34,25 +29,10 @@ public:
 
     wxColourData& GetColourData() { return m_colourData; }
 
-    // override some base class virtuals
-    virtual void SetTitle(const wxString& title);
-    virtual wxString GetTitle() const;
-
     virtual int ShowModal();
 
-    virtual void DoGetPosition( int *x, int *y ) const;
-
 protected:
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
     wxColourData        m_colourData;
-    wxString            m_title;
-
-    wxPoint             m_pos;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)
 };