need to overload assertEquals(int,short) too to resolve ambiguity

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

diff --git a/include/wx/palmos/statline.h b/include/wx/palmos/statline.h
index bccb0e8595260d95e4da2d9e45d526433a27262c..88854ee9b2da82af0caf7b808f7173ac0d8a8de1 100644 (file)
--- a/include/wx/palmos/statline.h
+++ b/include/wx/palmos/statline.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palmos/statline.h
+// Name:        wx/palmos/statline.h
 // Purpose:     Palm OS version of wxStaticLine class
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,36 +12,32 @@
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
 public:
     // constructors and pseudo-constructors
     wxStaticLine() { }
 
     wxStaticLine( wxWindow *parent,
-                  wxWindowID id,
+                  wxWindowID id = wxID_ANY,
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )
     {
         Create(parent, id, pos, size, style, name);
     }
 
     bool Create( wxWindow *parent,
-                 wxWindowID id,
+                 wxWindowID id = wxID_ANY,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxStaticLineNameStr );
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }