free argv in Unicode build

[wxWidgets.git] / samples / proplist / proplist.h

diff --git a/samples/proplist/proplist.h b/samples/proplist/proplist.h
index deabd5c5fd079923d2eb2851f8bb023e0e3c1fa7..f984f056552c01f6784d206bb8cae317d30aee78 100644 (file)
--- a/samples/proplist/proplist.h
+++ b/samples/proplist/proplist.h
@@ -6,10 +6,10 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "proplist_sample.h"
 #endif
 
 #pragma interface "proplist_sample.h"
 #endif
 


@@ -61,7 +61,7 @@ class PropListFrame: public wxPropertyListFrame
 public:
   PropListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 public:
   PropListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
+    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = _T("frame")):

         wxPropertyListFrame(v, parent, title, pos, size, style, name)
     {
     }
         wxPropertyListFrame(v, parent, title, pos, size, style, name)
     {
     }


@@ -76,7 +76,7 @@ class PropListDialog: public wxPropertyListDialog
 public:
   PropListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 public:
   PropListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-    long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox"):
+    long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = _T("dialogBox")):

         wxPropertyListDialog(v, parent, title, pos, size, style, name)
    {
    }
         wxPropertyListDialog(v, parent, title, pos, size, style, name)
    {
    }


@@ -91,7 +91,7 @@ class PropFormFrame: public wxPropertyFormFrame
 public:
   PropFormFrame(wxPropertyFormView *v, wxFrame *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 public:
   PropFormFrame(wxPropertyFormView *v, wxFrame *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
+    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = _T("frame")):

     wxPropertyFormFrame(v, parent, title, pos, size, style, name)
     {
     }
     wxPropertyFormFrame(v, parent, title, pos, size, style, name)
     {
     }


@@ -107,7 +107,7 @@ class PropFormDialog: public wxPropertyFormDialog
 public:
   PropFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 public:
   PropFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-    long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox"):
+    long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = _T("dialogBox")):

       wxPropertyFormDialog(v, parent, title, pos, size, style, name)
     {
     }
       wxPropertyFormDialog(v, parent, title, pos, size, style, name)
     {
     }