Applied patch [ 1178610 ] datectlg.cpp: wxDropdownButton + bug fixes

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 6dafd5d0790fb6417bd3a0ffa37d8116db5318e0..ee26cbdd017c701f129b05829745fc6beb9168c7 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -73,6 +73,8 @@
     #include <wtime.h>
 #endif
 
     #include <wtime.h>
 #endif
 

+#include "wx/datetime.h"
+

 // the suffix we add to the button to show that the dialog can be expanded
 #define EXPAND_SUFFIX _T(" >>")
 
 // the suffix we add to the button to show that the dialog can be expanded
 #define EXPAND_SUFFIX _T(" >>")
 


@@ -130,18 +132,22 @@ private:
     wxArrayLong m_times;
 
     // the "toggle" button and its state
     wxArrayLong m_times;
 
     // the "toggle" button and its state

+#ifndef __SMARTPHONE__

     wxButton *m_btnDetails;
     wxButton *m_btnDetails;

+#endif

     bool      m_showingDetails;
 
     // the controls which are not shown initially (but only when details
     // button is pressed)
     wxListCtrl *m_listctrl;
     bool      m_showingDetails;
 
     // the controls which are not shown initially (but only when details
     // button is pressed)
     wxListCtrl *m_listctrl;

+#ifndef __SMARTPHONE__

 #if wxUSE_STATLINE
     wxStaticLine *m_statline;
 #endif // wxUSE_STATLINE
 #if wxUSE_FILE
     wxButton *m_btnSave;
 #endif // wxUSE_FILE
 #if wxUSE_STATLINE
     wxStaticLine *m_statline;
 #endif // wxUSE_STATLINE
 #if wxUSE_FILE
     wxButton *m_btnSave;
 #endif // wxUSE_FILE

+#endif // __SMARTPHONE__

 
     // the translated "Details" string
     static wxString ms_details;
 
     // the translated "Details" string
     static wxString ms_details;


@@ -151,12 +157,12 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)

-    EVT_BUTTON(wxID_CANCEL, wxLogDialog::OnOk)
+    EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)

     EVT_BUTTON(wxID_MORE,   wxLogDialog::OnDetails)
 #if wxUSE_FILE
     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)
 #endif // wxUSE_FILE
     EVT_BUTTON(wxID_MORE,   wxLogDialog::OnDetails)
 #if wxUSE_FILE
     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)
 #endif // wxUSE_FILE

-    EVT_LIST_ITEM_SELECTED(-1, wxLogDialog::OnListSelect)
+    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxLogDialog::OnListSelect)

 END_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG
 END_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG


@@ -168,8 +174,8 @@ END_EVENT_TABLE()
 #if wxUSE_FILE && wxUSE_FILEDLG
 
 // pass an uninitialized file object, the function will ask the user for the
 #if wxUSE_FILE && wxUSE_FILEDLG
 
 // pass an uninitialized file object, the function will ask the user for the

-// filename and try to open it, returns TRUE on success (file was opened),
-// FALSE if file couldn't be opened/created and -1 if the file selection
+// filename and try to open it, returns true on success (file was opened),
+// false if file couldn't be opened/created and -1 if the file selection

 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
 
 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
 


@@ -235,7 +241,7 @@ void wxLogGui::Clear()
 {
     m_bErrors =
     m_bWarnings =
 {
     m_bErrors =
     m_bWarnings =

-    m_bHasMessages = FALSE;
+    m_bHasMessages = false;

 
     m_aMessages.Empty();
     m_aSeverity.Empty();
 
     m_aMessages.Empty();
     m_aSeverity.Empty();


@@ -248,11 +254,11 @@ void wxLogGui::Flush()
         return;
 
     // do it right now to block any new calls to Flush() while we're here
         return;
 
     // do it right now to block any new calls to Flush() while we're here

-    m_bHasMessages = FALSE;
+    m_bHasMessages = false;

 
     wxString appName = wxTheApp->GetAppName();
 
     wxString appName = wxTheApp->GetAppName();

-    if ( !!appName )
-        appName[0u] = wxToupper(appName[0u]);
+    if ( !appName.empty() )
+        appName[0u] = (wxChar)wxToupper(appName[0u]);

 
     long style;
     wxString titleFormat;
 
     long style;
     wxString titleFormat;


@@ -317,7 +323,7 @@ void wxLogGui::Flush()
 
     // this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
     // situation without it
 
     // this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
     // situation without it

-    if ( !!str )
+    if ( !str.empty() )

     {
         wxMessageBox(str, title, wxOK | style);
 
     {
         wxMessageBox(str, title, wxOK | style);
 


@@ -340,7 +346,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                 m_aMessages.Add(szString);
                 m_aSeverity.Add(wxLOG_Message);
                 m_aTimes.Add((long)t);
                 m_aMessages.Add(szString);
                 m_aSeverity.Add(wxLOG_Message);
                 m_aTimes.Add((long)t);

-                m_bHasMessages = TRUE;
+                m_bHasMessages = true;

             }
             break;
 
             }
             break;
 


@@ -404,20 +410,20 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                 m_aSeverity.Empty();
                 m_aTimes.Empty();
 #endif // wxUSE_LOG_DIALOG
                 m_aSeverity.Empty();
                 m_aTimes.Empty();
 #endif // wxUSE_LOG_DIALOG

-                m_bErrors = TRUE;
+                m_bErrors = true;

             }
             // fall through
 
         case wxLOG_Warning:
             if ( !m_bErrors ) {
                 // for the warning we don't discard the info messages
             }
             // fall through
 
         case wxLOG_Warning:
             if ( !m_bErrors ) {
                 // for the warning we don't discard the info messages

-                m_bWarnings = TRUE;
+                m_bWarnings = true;

             }
 
             m_aMessages.Add(szString);
             m_aSeverity.Add((int)level);
             m_aTimes.Add((long)t);
             }
 
             m_aMessages.Add(szString);
             m_aSeverity.Add((int)level);
             m_aTimes.Add((long)t);

-            m_bHasMessages = TRUE;
+            m_bHasMessages = true;

             break;
     }
 }
             break;
     }
 }


@@ -434,7 +440,7 @@ class wxLogFrame : public wxFrame
 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor

-    wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
+    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);

     virtual ~wxLogFrame();
 
     // menu callbacks
     virtual ~wxLogFrame();
 
     // menu callbacks


@@ -478,12 +484,12 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
 END_EVENT_TABLE()
 

-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
-          : wxFrame(pParent, -1, szTitle)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
+          : wxFrame(pParent, wxID_ANY, szTitle)

 {
     m_log = log;
 
 {
     m_log = log;
 

-    m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+    m_pTextCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,

             wxDefaultSize,
             wxTE_MULTILINE  |
             wxHSCROLL       |
             wxDefaultSize,
             wxTE_MULTILINE  |
             wxHSCROLL       |


@@ -522,7 +528,7 @@ void wxLogFrame::DoClose()
     {
         // instead of closing just hide the window to be able to Show() it
         // later
     {
         // instead of closing just hide the window to be able to Show() it
         // later

-        Show(FALSE);
+        Show(false);

     }
 }
 
     }
 }
 


@@ -585,7 +591,7 @@ wxLogFrame::~wxLogFrame()
 // wxLogWindow
 // -----------
 
 // wxLogWindow
 // -----------
 

-wxLogWindow::wxLogWindow(wxFrame *pParent,
+wxLogWindow::wxLogWindow(wxWindow *pParent,

                          const wxChar *szTitle,
                          bool bShow,
                          bool bDoPass)
                          const wxChar *szTitle,
                          bool bShow,
                          bool bDoPass)


@@ -595,7 +601,7 @@ wxLogWindow::wxLogWindow(wxFrame *pParent,
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
 
     if ( bShow )
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
 
     if ( bShow )

-        m_pLogFrame->Show(TRUE);
+        m_pLogFrame->Show();

 }
 
 void wxLogWindow::Show(bool bShow)
 }
 
 void wxLogWindow::Show(bool bShow)


@@ -642,7 +648,7 @@ void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
     // remove selection (WriteText is in fact ReplaceSelection)
 #ifdef __WXMSW__
 
     // remove selection (WriteText is in fact ReplaceSelection)
 #ifdef __WXMSW__

-    long nLen = pText->GetLastPosition();
+    wxTextPos nLen = pText->GetLastPosition();

     pText->SetSelection(nLen, nLen);
 #endif // Windows
 
     pText->SetSelection(nLen, nLen);
 #endif // Windows
 


@@ -667,7 +673,7 @@ void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
 bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 {
     // allow to close
 bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 {
     // allow to close

-    return TRUE;
+    return true;

 }
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 }
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))


@@ -687,7 +693,11 @@ wxLogWindow::~wxLogWindow()
 
 #if wxUSE_LOG_DIALOG
 
 
 #if wxUSE_LOG_DIALOG
 

+#ifndef __SMARTPHONE__

 static const size_t MARGIN = 10;
 static const size_t MARGIN = 10;

+#else
+static const size_t MARGIN = 0;
+#endif

 
 wxString wxLogDialog::ms_details;
 
 
 wxString wxLogDialog::ms_details;
 


@@ -697,16 +707,19 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)

-           : wxDialog(parent, -1, caption,
+           : wxDialog(parent, wxID_ANY, caption,

                       wxDefaultPosition, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
                       wxDefaultPosition, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {

-    if ( ms_details.IsEmpty() )
+    if ( ms_details.empty() )

     {
         // ensure that we won't loop here if wxGetTranslation()
         // happens to pop up a Log message while translating this :-)
         ms_details = wxTRANSLATE("&Details");
         ms_details = wxGetTranslation(ms_details);
     {
         // ensure that we won't loop here if wxGetTranslation()
         // happens to pop up a Log message while translating this :-)
         ms_details = wxTRANSLATE("&Details");
         ms_details = wxGetTranslation(ms_details);

+#ifdef __SMARTPHONE__
+        ms_details = wxStripMenuCodes(ms_details);
+#endif

     }
 
     size_t count = messages.GetCount();
     }
 
     size_t count = messages.GetCount();


@@ -717,20 +730,17 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     for ( size_t n = 0; n < count; n++ )
     {
         wxString msg = messages[n];
     for ( size_t n = 0; n < count; n++ )
     {
         wxString msg = messages[n];

-        do
-        {
-            m_messages.Add(msg.BeforeFirst(_T('\n')));
-            msg = msg.AfterFirst(_T('\n'));
-
-            m_severity.Add(severity[n]);
-            m_times.Add(times[n]);
-        }
-        while ( !!msg );
+        msg.Replace(wxT("\n"), wxT(" "));
+        m_messages.Add(msg);
+        m_severity.Add(severity[n]);
+        m_times.Add(times[n]);

     }
 
     }
 

-    m_showingDetails = FALSE; // not initially
+    m_showingDetails = false; // not initially

     m_listctrl = (wxListCtrl *)NULL;
 
     m_listctrl = (wxListCtrl *)NULL;
 

+#ifndef __SMARTPHONE__
+

 #if wxUSE_STATLINE
     m_statline = (wxStaticLine *)NULL;
 #endif // wxUSE_STATLINE
 #if wxUSE_STATLINE
     m_statline = (wxStaticLine *)NULL;
 #endif // wxUSE_STATLINE


@@ -739,20 +749,28 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     m_btnSave = (wxButton *)NULL;
 #endif // wxUSE_FILE
 
     m_btnSave = (wxButton *)NULL;
 #endif // wxUSE_FILE
 

+#endif // __SMARTPHONE__
+
+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+

     // create the controls which are always shown and layout them: we use
     // sizers even though our window is not resizeable to calculate the size of
     // the dialog properly
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     // create the controls which are always shown and layout them: we use
     // sizers even though our window is not resizeable to calculate the size of
     // the dialog properly
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);

-    wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer *sizerAll = new wxBoxSizer(wxHORIZONTAL);
-
-    // this "Ok" button has wxID_CANCEL id - not very logical, but this allows
-    // to close the log dialog with <Esc> which wouldn't work otherwise (as it
-    // translates into click on cancel button)
-    wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));
-    sizerButtons->Add(btnOk, 0, wxCENTRE | wxBOTTOM, MARGIN/2);
+#ifndef __SMARTPHONE__
+    wxBoxSizer *sizerButtons = new wxBoxSizer(isPda ? wxHORIZONTAL : wxVERTICAL);
+#endif
+    wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);
+
+#ifdef __SMARTPHONE__
+    SetLeftMenu(wxID_OK);
+    SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
+#else
+    wxButton *btnOk = new wxButton(this, wxID_OK);
+    sizerButtons->Add(btnOk, 0, isPda ? wxCENTRE : wxCENTRE|wxBOTTOM, MARGIN/2);

     m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX);
     m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX);

-    sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);
+    sizerButtons->Add(m_btnDetails, 0, isPda ? wxCENTRE|wxLEFT : wxCENTRE | wxTOP, MARGIN/2 - 1);
+#endif

 
     wxBitmap bitmap;
     switch ( style & wxICON_MASK )
 
     wxBitmap bitmap;
     switch ( style & wxICON_MASK )


@@ -781,16 +799,20 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
         default:
             wxFAIL_MSG(_T("incorrect log style"));
     }
         default:
             wxFAIL_MSG(_T("incorrect log style"));
     }

-    sizerAll->Add(new wxStaticBitmap(this, -1, bitmap), 0);
+
+    if (!isPda)
+        sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0,
+                  wxALIGN_CENTRE_VERTICAL);

 
     const wxString& message = messages.Last();
     sizerAll->Add(CreateTextSizer(message), 1,
                   wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
 
     const wxString& message = messages.Last();
     sizerAll->Add(CreateTextSizer(message), 1,
                   wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);

-    sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT | wxLEFT, MARGIN);
+#ifndef __SMARTPHONE__
+    sizerAll->Add(sizerButtons, 0, isPda ? wxCENTRE|wxTOP|wxBOTTOM : (wxALIGN_RIGHT | wxLEFT), MARGIN);
+#endif

 
     sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
 
 
     sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
 

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
 
     // see comments in OnDetails()
     SetSizer(sizerTop);
 
     // see comments in OnDetails()


@@ -807,39 +829,46 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     m_maxHeight = size.y;
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 
     m_maxHeight = size.y;
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 

+#ifndef __SMARTPHONE__

     btnOk->SetFocus();
     btnOk->SetFocus();

+#endif

 
 

-    // this can't happen any more as we don't use this dialog in this case
-#if 0
-    if ( count == 1 )
+    Centre();
+
+    if (isPda)

     {
     {

-        // no details... it's easier to disable a button than to change the
-        // dialog layout depending on whether we have details or not
-        m_btnDetails->Disable();
+        // Move up the screen so that when we expand the dialog,
+        // there's enough space.
+        Move(wxPoint(GetPosition().x, GetPosition().y / 2));

     }
     }

-#endif // 0
-
-    Centre();

 }
 
 void wxLogDialog::CreateDetailsControls()
 {
 }
 
 void wxLogDialog::CreateDetailsControls()
 {

+#ifndef __SMARTPHONE__

     // create the save button and separator line if possible
 #if wxUSE_FILE
     // create the save button and separator line if possible
 #if wxUSE_FILE

-    m_btnSave = new wxButton(this, wxID_SAVE, _("&Save..."));
+    m_btnSave = new wxButton(this, wxID_SAVE);

 #endif // wxUSE_FILE
 
 #if wxUSE_STATLINE
 #endif // wxUSE_FILE
 
 #if wxUSE_STATLINE

-    m_statline = new wxStaticLine(this, -1);
+    m_statline = new wxStaticLine(this, wxID_ANY);

 #endif // wxUSE_STATLINE
 
 #endif // wxUSE_STATLINE
 

+#endif // __SMARTPHONE__
+

     // create the list ctrl now
     // create the list ctrl now

-    m_listctrl = new wxListCtrl(this, -1,
+    m_listctrl = new wxListCtrl(this, wxID_ANY,

                                 wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER |
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);
                                 wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER |
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);

+#ifdef __WXWINCE__
+    // This maks a big aesthetic difference on WinCE but I
+    // don't want to risk problems on other platforms
+    m_listctrl->Hide();
+#endif

 
     // no need to translate these strings as they're not shown to the
     // user anyhow (we use wxLC_NO_HEADER style)
 
     // no need to translate these strings as they're not shown to the
     // user anyhow (we use wxLC_NO_HEADER style)


@@ -858,7 +887,7 @@ void wxLogDialog::CreateDetailsControls()
         wxART_INFORMATION
     };
 
         wxART_INFORMATION
     };
 

-    bool loadedIcons = TRUE;
+    bool loadedIcons = true;

 
     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {
 
     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {


@@ -869,7 +898,7 @@ void wxLogDialog::CreateDetailsControls()
         // Degrade gracefully.
         if ( !bmp.Ok() )
         {
         // Degrade gracefully.
         if ( !bmp.Ok() )
         {

-            loadedIcons = FALSE;
+            loadedIcons = false;

 
             break;
         }
 
             break;
         }


@@ -884,7 +913,7 @@ void wxLogDialog::CreateDetailsControls()
     if ( !fmt )
     {
         // default format
     if ( !fmt )
     {
         // default format

-        fmt = _T("%c");
+        fmt = wxDefaultDateTimeFormat;

     }
 
     size_t count = m_messages.GetCount();
     }
 
     size_t count = m_messages.GetCount();


@@ -935,7 +964,7 @@ void wxLogDialog::CreateDetailsControls()
     heightMax *= 9;
     heightMax /= 10;
 
     heightMax *= 9;
     heightMax /= 10;
 

-    m_listctrl->SetSize(-1, wxMin(height, heightMax));
+    m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));

 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)
 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)


@@ -970,7 +999,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
     if ( !fmt )
     {
         // default format
     if ( !fmt )
     {
         // default format

-        fmt = _T("%c");
+        fmt = wxDefaultDateTimeFormat;

     }
 
     size_t count = m_messages.GetCount();
     }
 
     size_t count = m_messages.GetCount();


@@ -1001,10 +1030,16 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
 
     if ( m_showingDetails )
     {
 
     if ( m_showingDetails )
     {

+#ifdef __SMARTPHONE__
+        SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
+#else

         m_btnDetails->SetLabel(ms_details + EXPAND_SUFFIX);
         m_btnDetails->SetLabel(ms_details + EXPAND_SUFFIX);

+#endif

 
         sizer->Detach( m_listctrl );
 
 
         sizer->Detach( m_listctrl );
 

+#ifndef __SMARTPHONE__
+

 #if wxUSE_STATLINE
         sizer->Detach( m_statline );
 #endif // wxUSE_STATLINE
 #if wxUSE_STATLINE
         sizer->Detach( m_statline );
 #endif // wxUSE_STATLINE


@@ -1012,18 +1047,26 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_FILE
         sizer->Detach( m_btnSave );
 #endif // wxUSE_FILE
 #if wxUSE_FILE
         sizer->Detach( m_btnSave );
 #endif // wxUSE_FILE

+
+#endif // __SMARTPHONE__

     }
     else // show details now
     {
     }
     else // show details now
     {

+#ifdef __SMARTPHONE__
+        SetRightMenu(wxID_MORE, wxString(_T("<< ")) + ms_details);
+#else

         m_btnDetails->SetLabel(wxString(_T("<< ")) + ms_details);
         m_btnDetails->SetLabel(wxString(_T("<< ")) + ms_details);

+#endif

 
         if ( !m_listctrl )
         {
             CreateDetailsControls();
         }
 
 
         if ( !m_listctrl )
         {
             CreateDetailsControls();
         }
 

-#if wxUSE_STATLINE
-        sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+#if wxUSE_STATLINE && !defined(__SMARTPHONE__)
+        bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+        if (!isPda)
+            sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);

 #endif // wxUSE_STATLINE
 
         sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
 #endif // wxUSE_STATLINE
 
         sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);


@@ -1037,7 +1080,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
         sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
 #endif // 0
 
         sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
 #endif // 0
 

-#if wxUSE_FILE
+#if wxUSE_FILE && !defined(__SMARTPHONE__)

         sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
 #endif // wxUSE_FILE
     }
         sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
 #endif // wxUSE_FILE
     }


@@ -1070,14 +1113,19 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
 
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 
 
     SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
 

+#ifdef __WXWINCE__
+    if (m_showingDetails)
+        m_listctrl->Show();
+#endif
+

     // don't change the width when expanding/collapsing
     // don't change the width when expanding/collapsing

-    SetSize(-1, size.y);
+    SetSize(wxDefaultCoord, size.y);

 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under
     // WindowMaker or fvwm2 (and probably other broken WMs).
     // Otherwise, detailed list wouldn't be displayed.
 
 #ifdef __WXGTK__
     // VS: this is neccessary in order to force frame redraw under
     // WindowMaker or fvwm2 (and probably other broken WMs).
     // Otherwise, detailed list wouldn't be displayed.

-    Show(TRUE);
+    Show();

 #endif // wxGTK
 }
 
 #endif // wxGTK
 }
 


@@ -1094,8 +1142,8 @@ wxLogDialog::~wxLogDialog()
 #if wxUSE_FILE && wxUSE_FILEDLG
 
 // pass an uninitialized file object, the function will ask the user for the
 #if wxUSE_FILE && wxUSE_FILEDLG
 
 // pass an uninitialized file object, the function will ask the user for the

-// filename and try to open it, returns TRUE on success (file was opened),
-// FALSE if file couldn't be opened/created and -1 if the file selection
+// filename and try to open it, returns true on success (file was opened),
+// false if file couldn't be opened/created and -1 if the file selection

 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 {
 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 {


@@ -1109,20 +1157,20 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 
     // open file
     // ---------
 
     // open file
     // ---------

-    bool bOk;
+    bool bOk wxDUMMY_INITIALIZE(false);

     if ( wxFile::Exists(filename) ) {
     if ( wxFile::Exists(filename) ) {

-        bool bAppend = FALSE;
+        bool bAppend = false;

         wxString strMsg;
         strMsg.Printf(_("Append log to file '%s' (choosing [No] will overwrite it)?"),
                       filename.c_str());
         switch ( wxMessageBox(strMsg, _("Question"),
                               wxICON_QUESTION | wxYES_NO | wxCANCEL) ) {
             case wxYES:
         wxString strMsg;
         strMsg.Printf(_("Append log to file '%s' (choosing [No] will overwrite it)?"),
                       filename.c_str());
         switch ( wxMessageBox(strMsg, _("Question"),
                               wxICON_QUESTION | wxYES_NO | wxCANCEL) ) {
             case wxYES:

-                bAppend = TRUE;
+                bAppend = true;

                 break;
 
             case wxNO:
                 break;
 
             case wxNO:

-                bAppend = FALSE;
+                bAppend = false;

                 break;
 
             case wxCANCEL:
                 break;
 
             case wxCANCEL:


@@ -1136,7 +1184,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
             bOk = file.Open(filename, wxFile::write_append);
         }
         else {
             bOk = file.Open(filename, wxFile::write_append);
         }
         else {

-            bOk = file.Create(filename, TRUE /* overwrite */);
+            bOk = file.Create(filename, true /* overwrite */);

         }
     }
     else {
         }
     }
     else {