Small fixes to allow compilation in Unicode mode with gcc

[wxWidgets.git] / contrib / samples / foldbar / foldpanelbar / layouttest.cpp

diff --git a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp b/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
index c0a23bff8f1539741a01b5ee58b94143bdc43e9a..b9d6814cd805b983738771bf73907212c090ece5 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
+++ b/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        layouttest.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        layouttest.cpp

-// Purpose:     
+// Purpose:

 // Author:      Jorgen Bodde
 // Author:      Jorgen Bodde

-// Modified by: 
-// Created:     06/25/04 19:48:57
-// RCS-ID:      
-// Copyright:   
-// Licence:     
+// Modified by:
+// Created:     25/06/2004
+// RCS-ID:      $Id$
+// Copyright:   (c) Jorgen Bodde
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "layouttest.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -66,7 +62,7 @@ LayoutTest::LayoutTest( wxWindow* parent, wxWindowID id, const wxString& caption
  * LayoutTest creator
  */
 
  * LayoutTest creator
  */
 

-bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )

 {
 ////@begin LayoutTest member initialisation
 ////@end LayoutTest member initialisation
 {
 ////@begin LayoutTest member initialisation
 ////@end LayoutTest member initialisation


@@ -80,7 +76,7 @@ bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& captio
     GetSizer()->SetSizeHints(this);
     Centre();
 ////@end LayoutTest creation
     GetSizer()->SetSizeHints(this);
     Centre();
 ////@end LayoutTest creation

-    return TRUE;
+    return true;

 }
 
 /*!
 }
 
 /*!


@@ -88,14 +84,14 @@ bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& captio
  */
 
 void LayoutTest::CreateControls()
  */
 
 void LayoutTest::CreateControls()

-{    
+{

 ////@begin LayoutTest content construction
 
     LayoutTest* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
 ////@begin LayoutTest content construction
 
     LayoutTest* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);

-    item1->SetAutoLayout(TRUE);
+    item1->SetAutoLayout(true);

     wxStaticText* item3 = new wxStaticText( item1, wxID_STATIC, _("lbaaaaaa"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetBackgroundColour(wxColour(139, 139, 139));
     item2->Add(item3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
     wxStaticText* item3 = new wxStaticText( item1, wxID_STATIC, _("lbaaaaaa"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetBackgroundColour(wxColour(139, 139, 139));
     item2->Add(item3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);


@@ -103,7 +99,7 @@ void LayoutTest::CreateControls()
     item2->Add(item4, 0, wxGROW, 5);
     wxBoxSizer* item5 = new wxBoxSizer(wxVERTICAL);
     item4->SetSizer(item5);
     item2->Add(item4, 0, wxGROW, 5);
     wxBoxSizer* item5 = new wxBoxSizer(wxVERTICAL);
     item4->SetSizer(item5);

-    item4->SetAutoLayout(TRUE);
+    item4->SetAutoLayout(true);

     wxStaticText* item6 = new wxStaticText( item4, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add(item6, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
     wxButton* item7 = new wxButton( item4, ID_BUTTON, _("Button"), wxDefaultPosition, wxDefaultSize, 0 );
     wxStaticText* item6 = new wxStaticText( item4, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add(item6, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
     wxButton* item7 = new wxButton( item4, ID_BUTTON, _("Button"), wxDefaultPosition, wxDefaultSize, 0 );


@@ -117,14 +113,14 @@ void LayoutTest::CreateControls()
 
 bool LayoutTest::ShowToolTips()
 {
 
 bool LayoutTest::ShowToolTips()
 {

-    return TRUE;
+    return true;

 }
 
 /*!
  * Get bitmap resources
  */
 
 }
 
 /*!
  * Get bitmap resources
  */
 

-wxBitmap LayoutTest::GetBitmapResource( const wxString& name )
+wxBitmap LayoutTest::GetBitmapResource( const wxString& WXUNUSED(name) )

 {
     // Bitmap retrieval
 ////@begin LayoutTest bitmap retrieval
 {
     // Bitmap retrieval
 ////@begin LayoutTest bitmap retrieval


@@ -136,7 +132,7 @@ wxBitmap LayoutTest::GetBitmapResource( const wxString& name )
  * Get icon resources
  */
 
  * Get icon resources
  */
 

-wxIcon LayoutTest::GetIconResource( const wxString& name )
+wxIcon LayoutTest::GetIconResource( const wxString& WXUNUSED(name) )

 {
     // Icon retrieval
 ////@begin LayoutTest icon retrieval
 {
     // Icon retrieval
 ////@begin LayoutTest icon retrieval