change wxDataViewItem id to void*

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

diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 9f711377a304c9ed730dde306729d4d0ffa93162..c69656ecabecf2dc4c0cd095ad4e2a45cacb6a77 100644 (file)
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -11,10 +11,6 @@
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface
-#endif
-

 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------


@@ -26,26 +22,25 @@ public:
     wxStaticLine() { }
 
     wxStaticLine( wxWindow *parent,
     wxStaticLine() { }
 
     wxStaticLine( wxWindow *parent,

-                  wxWindowID id,
-                  const wxPoint &pos = wxDefaultPosition,
-                  const wxSize &size = wxDefaultSize,
+                  wxWindowID id = wxID_ANY,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,

                   long style = wxLI_HORIZONTAL,
                   long style = wxLI_HORIZONTAL,

-                  const wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )

     {
         Create(parent, id, pos, size, style, name);
     }
 
     bool Create( wxWindow *parent,
     {
         Create(parent, id, pos, size, style, name);
     }
 
     bool Create( wxWindow *parent,

-                 wxWindowID id,
-                 const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,

                  long style = wxLI_HORIZONTAL,
                  long style = wxLI_HORIZONTAL,

-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxStaticLineNameStr );

 
     // overriden base class virtuals
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }

 
 

-protected:

     // usually overridden base class virtuals
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // usually overridden base class virtuals
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;