no_rtti fix was not having correct eval order

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

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 27e75a909749c9d7e524010e353494c00a17fddb..9b8d9b0599396bc393af8a5fcdfd653cc70631c9 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(" >>")
 


@@ -151,7 +153,7 @@ 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)
     EVT_BUTTON(wxID_MORE,   wxLogDialog::OnDetails)
 #if wxUSE_FILE
     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)


@@ -251,8 +253,8 @@ void wxLogGui::Flush()
     m_bHasMessages = false;
 
     wxString appName = wxTheApp->GetAppName();
     m_bHasMessages = false;
 
     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 +319,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);
 


@@ -434,7 +436,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,7 +480,7 @@ 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)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)

           : wxFrame(pParent, wxID_ANY, szTitle)
 {
     m_log = log;
           : wxFrame(pParent, wxID_ANY, szTitle)
 {
     m_log = log;


@@ -585,7 +587,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)


@@ -642,7 +644,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
 


@@ -701,7 +703,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
                       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 :-)
     {
         // ensure that we won't loop here if wxGetTranslation()
         // happens to pop up a Log message while translating this :-)


@@ -734,22 +736,19 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     m_btnSave = (wxButton *)NULL;
 #endif // wxUSE_FILE
 
     m_btnSave = (wxButton *)NULL;
 #endif // wxUSE_FILE
 

+    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)
+    wxBoxSizer *sizerButtons = new wxBoxSizer(isPda ? wxHORIZONTAL : wxVERTICAL);
+    wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);

 
 

-    // FIXME: use stock button here!
-    wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));
-    sizerButtons->Add(btnOk, 0, wxCENTRE | wxBOTTOM, MARGIN/2);
+    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);

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


@@ -778,13 +777,15 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
         default:
             wxFAIL_MSG(_T("incorrect log style"));
     }
         default:
             wxFAIL_MSG(_T("incorrect log style"));
     }

-    sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, 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);
                   wxALIGN_CENTRE_VERTICAL);
 
     const wxString& message = messages.Last();
     sizerAll->Add(CreateTextSizer(message), 1,
                   wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);

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

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


@@ -806,17 +807,14 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
     btnOk->SetFocus();
 
 
     btnOk->SetFocus();
 

-    // 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()


@@ -837,6 +835,11 @@ void wxLogDialog::CreateDetailsControls()
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);
                                 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)


@@ -881,7 +884,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();


@@ -967,7 +970,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();


@@ -1020,7 +1023,9 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
         }
 
 #if wxUSE_STATLINE
         }
 
 #if wxUSE_STATLINE

-        sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+        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);


@@ -1067,6 +1072,11 @@ 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
     SetSize(wxDefaultCoord, size.y);
 
     // don't change the width when expanding/collapsing
     SetSize(wxDefaultCoord, size.y);