By default, align renderers as column header under GTK+, too.

[wxWidgets.git] / samples / widgets / widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 31d4763ccebe9b5c1e492d98ff5774b547a59272..1637eb113b841050f47c30b7d6eb9fc1f654936b 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -30,6 +30,7 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/menu.h"

+    #include "wx/image.h"

 
     #include "wx/button.h"
     #include "wx/checkbox.h"
 
     #include "wx/button.h"
     #include "wx/checkbox.h"


@@ -205,7 +206,7 @@ public:
 
 private:
     // implement sink functions
 
 private:
     // implement sink functions

-    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+    virtual void DoLog(wxLogLevel level, const wxString& str, time_t t)

     {
         // don't put trace messages into listbox or we can get into infinite
         // recursion
     {
         // don't put trace messages into listbox or we can get into infinite
         // recursion


@@ -214,20 +215,20 @@ private:
             if ( m_logOld )
             {
                 // cast is needed to call protected method
             if ( m_logOld )
             {
                 // cast is needed to call protected method

-                ((LboxLogger *)m_logOld)->DoLog(level, szString, t);
+                ((LboxLogger *)m_logOld)->DoLog(level, str, t);

             }
         }
         else
         {
             }
         }
         else
         {

-            wxLog::DoLog(level, szString, t);
+            wxLog::DoLog(level, str, t);

         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+    virtual void DoLogString(const wxString& str, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);

-        msg += szString;
+        msg += str;

 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);
 
         #ifdef __WXUNIVERSAL__
             m_lbox->AppendAndEnsureVisible(msg);


@@ -316,6 +317,10 @@ bool WidgetsApp::OnInit()
     title += _T("wxMAC");
 #elif defined(__WXMOTIF__)
     title += _T("wxMOTIF");
     title += _T("wxMAC");
 #elif defined(__WXMOTIF__)
     title += _T("wxMOTIF");

+#elif __WXPALMOS5__
+    title += _T("wxPALMOS5");
+#elif __WXPALMOS6__
+    title += _T("wxPALMOS6");

 #else
     title += _T("wxWidgets");
 #endif
 #else
     title += _T("wxWidgets");
 #endif


@@ -443,7 +448,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
     m_panel->SetSizer(sizerTop);
 
 
     m_panel->SetSizer(sizerTop);
 

-    sizerTop->Fit(this);

     sizerTop->SetSizeHints(this);
 
 #if USE_LOG && !defined(__WXCOCOA__)
     sizerTop->SetSizeHints(this);
 
 #if USE_LOG && !defined(__WXCOCOA__)


@@ -922,7 +926,7 @@ WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
 
 WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                          wxImageList *imaglist,
 
 WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                          wxImageList *imaglist,

-                         char* icon[])
+                         const char *const icon[])

            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |