fix for group names containing ']'

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index a45c841cbdf1db1cfae86d02d79e1660dfab1d63..ef975509eaf419da83520ea8786c799de4568044 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -40,6 +40,8 @@
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"

+    #include "wx/msgdlg.h"
+    #include "wx/statusbr.h"

 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS
 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS


@@ -51,6 +53,10 @@
     #include "wx/dnd.h"
 #endif // wxUSE_DRAG_AND_DROP
 
     #include "wx/dnd.h"
 #endif // wxUSE_DRAG_AND_DROP
 

+#if wxUSE_HELP
+    #include "wx/cshelp.h"
+#endif // wxUSE_HELP
+

 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS


@@ -74,6 +80,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
     EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
     EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)
 BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
     EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
     EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)

+    EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
+
+#if wxUSE_HELP
+    EVT_HELP(-1, wxWindowBase::OnHelp)
+#endif // wxUSE_HELP
+

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -121,12 +133,10 @@ void wxWindowBase::InitBase()
     // m_foregroundColour = *wxBLACK;  // TODO take this from sys settings too?
     m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
 
     // m_foregroundColour = *wxBLACK;  // TODO take this from sys settings too?
     m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
 

-#if !defined(__WXMAC__) && !defined(__WXGTK__)
-    m_font = *wxSWISS_FONT;         //      and this?
-#else
-       m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-#endif
+    // GRG, changed Mar/2000
+    m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

     // no style bits
     // no style bits

+    m_exStyle =

     m_windowStyle = 0;
 
     // an optimization for the event processing: checking this flag is much
     m_windowStyle = 0;
 
     // an optimization for the event processing: checking this flag is much


@@ -152,6 +162,9 @@ void wxWindowBase::InitBase()
 #if wxUSE_CARET
     m_caret = (wxCaret *)NULL;
 #endif // wxUSE_CARET
 #if wxUSE_CARET
     m_caret = (wxCaret *)NULL;
 #endif // wxUSE_CARET

+
+    // Whether we're using the current theme for this window (wxGTK only for now)
+    m_themeEnabled = FALSE;

 }
 
 // common part of window creation process
 }
 
 // common part of window creation process


@@ -179,6 +192,14 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
     SetValidator(validator);
 #endif // wxUSE_VALIDATORS
 
     SetValidator(validator);
 #endif // wxUSE_VALIDATORS
 

+    // if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
+    // have it too - like this it's possible to set it only in the top level
+    // dialog/frame and all children will inherit it by defult
+    if ( parent && (parent->GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
+    {
+        SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -307,13 +328,32 @@ bool wxWindowBase::DestroyChildren()
 // centre the window with respect to its parent in either (or both) directions
 void wxWindowBase::Centre(int direction)
 {
 // centre the window with respect to its parent in either (or both) directions
 void wxWindowBase::Centre(int direction)
 {

+    // the position/size of the parent window or of the entire screen
+    wxPoint posParent;

     int widthParent, heightParent;
 
     int widthParent, heightParent;
 

-    wxWindow *parent = GetParent();
-    if ( !parent )
+    wxWindow *parent = NULL;
+
+    if ( !(direction & wxCENTRE_ON_SCREEN) )

     {
     {

-        // no other choice
-        direction |= wxCENTRE_ON_SCREEN;
+        // find the parent to centre this window on: it should be the
+        // immediate parent for the controls but the top level parent for the
+        // top level windows (like dialogs)
+        parent = GetParent();
+        if ( IsTopLevel() )
+        {
+            while ( parent && !parent->IsTopLevel() )
+            {
+                parent = parent->GetParent();
+            }
+        }
+
+        // did we find the parent?
+        if ( !parent )
+        {
+            // no other choice
+            direction |= wxCENTRE_ON_SCREEN;
+        }

     }
 
     if ( direction & wxCENTRE_ON_SCREEN )
     }
 
     if ( direction & wxCENTRE_ON_SCREEN )


@@ -323,8 +363,19 @@ void wxWindowBase::Centre(int direction)
     }
     else
     {
     }
     else
     {

-        // centre inside the parents rectangle
-        parent->GetClientSize(&widthParent, &heightParent);
+        if ( IsTopLevel() )
+        {
+            // centre on the parent
+            parent->GetSize(&widthParent, &heightParent);
+
+            // adjust to the parents position
+            posParent = parent->GetPosition();
+        }
+        else
+        {
+            // centre inside the parents client rectangle
+            parent->GetClientSize(&widthParent, &heightParent);
+        }

     }
 
     int width, height;
     }
 
     int width, height;


@@ -339,19 +390,8 @@ void wxWindowBase::Centre(int direction)
     if ( direction & wxVERTICAL )
         yNew = (heightParent - height)/2;
 
     if ( direction & wxVERTICAL )
         yNew = (heightParent - height)/2;
 

-    // controls are always centered on their parent because it doesn't make
-    // sense to centre them on the screen
-    if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
-    {
-        // theo nly chance to get this is to have a wxControl without parent
-        wxCHECK_RET( parent, wxT("a control must have a parent") );
-
-        // adjust to the parents client area origin
-        wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
-
-        xNew += posParent.x;
-        yNew += posParent.y;
-    }
+    xNew += posParent.x;
+    yNew += posParent.y;

 
     // move the centre of this window to this position
     Move(xNew, yNew);
 
     // move the centre of this window to this position
     Move(xNew, yNew);


@@ -381,15 +421,24 @@ wxSize wxWindowBase::DoGetBestSize() const
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();

-            if ( win->IsTopLevel() )
+            if ( win->IsTopLevel() || wxDynamicCast(win, wxStatusBar) )

             {
                 // dialogs and frames lie in different top level windows -
             {
                 // dialogs and frames lie in different top level windows -

-                // don't deal with them here
+                // don't deal with them here; as for the status bars, they
+                // don't lie in the client area at all

                 continue;
             }
 
             int wx, wy, ww, wh;
             win->GetPosition(&wx, &wy);
                 continue;
             }
 
             int wx, wy, ww, wh;
             win->GetPosition(&wx, &wy);

+
+            // if the window hadn't been positioned yet, assume that it is in
+            // the origin
+            if ( wx == -1 )
+                wx = 0;
+            if ( wy == -1 )
+                wy = 0;
+

             win->GetSize(&ww, &wh);
             if ( wx + ww > maxX )
                 maxX = wx + ww;
             win->GetSize(&ww, &wh);
             if ( wx + ww > maxX )
                 maxX = wx + ww;


@@ -467,6 +516,11 @@ void wxWindowBase::AddChild(wxWindowBase *child)
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
 
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
 

+    // this should never happen and it will lead to a crash later if it does
+    // because RemoveChild() will remove only one node from the children list
+    // and the other(s) one(s) will be left with dangling pointers in them
+    wxASSERT_MSG( !GetChildren().Find(child), _T("AddChild() called twice") );
+

     GetChildren().Append(child);
     child->SetParent(this);
 }
     GetChildren().Append(child);
     child->SetParent(this);
 }


@@ -565,16 +619,15 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour )
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {

-    // don't try to set invalid cursor, always fall back to the default
-    const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
-
-    if ( (wxCursor&)cursorOk == m_cursor )
+    // setting an invalid cursor is ok, it means that we don't have any special
+    // cursor
+    if ( m_cursor == cursor )

     {
         // no change
         return FALSE;
     }
 
     {
         // no change
         return FALSE;
     }
 

-    m_cursor = cursorOk;
+    m_cursor = cursor;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -704,6 +757,8 @@ void wxWindowBase::MakeModal(bool modal)
 bool wxWindowBase::Validate()
 {
 #if wxUSE_VALIDATORS
 bool wxWindowBase::Validate()
 {
 #if wxUSE_VALIDATORS

+    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
+

     wxWindowList::Node *node;
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
     wxWindowList::Node *node;
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {


@@ -713,6 +768,11 @@ bool wxWindowBase::Validate()
         {
             return FALSE;
         }
         {
             return FALSE;
         }

+
+        if ( recurse && !child->Validate() )
+        {
+            return FALSE;
+        }

     }
 #endif // wxUSE_VALIDATORS
 
     }
 #endif // wxUSE_VALIDATORS
 


@@ -722,6 +782,8 @@ bool wxWindowBase::Validate()
 bool wxWindowBase::TransferDataToWindow()
 {
 #if wxUSE_VALIDATORS
 bool wxWindowBase::TransferDataToWindow()
 {
 #if wxUSE_VALIDATORS

+    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
+

     wxWindowList::Node *node;
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
     wxWindowList::Node *node;
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {


@@ -729,15 +791,20 @@ bool wxWindowBase::TransferDataToWindow()
         wxValidator *validator = child->GetValidator();
         if ( validator && !validator->TransferToWindow() )
         {
         wxValidator *validator = child->GetValidator();
         if ( validator && !validator->TransferToWindow() )
         {

-            wxLog *log = wxLog::GetActiveTarget();
-            if ( log )
-            {
-                wxLogWarning(_("Could not transfer data to window"));
-                log->Flush();
-            }
+            wxLogWarning(_("Could not transfer data to window"));
+            wxLog::FlushActive();

 
             return FALSE;
         }
 
             return FALSE;
         }

+
+        if ( recurse )
+        {
+            if ( !child->TransferDataToWindow() )
+            {
+                // warning already given
+                return FALSE;
+            }
+        }

     }
 #endif // wxUSE_VALIDATORS
 
     }
 #endif // wxUSE_VALIDATORS
 


@@ -747,15 +814,29 @@ bool wxWindowBase::TransferDataToWindow()
 bool wxWindowBase::TransferDataFromWindow()
 {
 #if wxUSE_VALIDATORS
 bool wxWindowBase::TransferDataFromWindow()
 {
 #if wxUSE_VALIDATORS

+    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
+

     wxWindowList::Node *node;
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();
     wxWindowList::Node *node;
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();

-        if ( child->GetValidator() &&
-             !child->GetValidator()->TransferFromWindow() )
+        wxValidator *validator = child->GetValidator();
+        if ( validator && !validator->TransferFromWindow() )

         {
         {

+            // nop warning here because the application is supposed to give
+            // one itself - we don't know here what might have gone wrongly
+

             return FALSE;
         }
             return FALSE;
         }

+
+        if ( recurse )
+        {
+            if ( !child->TransferDataFromWindow() )
+            {
+                // warning already given
+                return FALSE;
+            }
+        }

     }
 #endif // wxUSE_VALIDATORS
 
     }
 #endif // wxUSE_VALIDATORS
 


@@ -769,6 +850,64 @@ void wxWindowBase::InitDialog()
     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// context-sensitive help support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_HELP
+
+// associate this help text with this window
+void wxWindowBase::SetHelpText(const wxString& text)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        helpProvider->AddHelp(this, text);
+    }
+}
+
+// associate this help text with all windows with the same id as this
+// one
+void wxWindowBase::SetHelpTextForId(const wxString& text)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        helpProvider->AddHelp(GetId(), text);
+    }
+}
+
+// get the help string associated with this window (may be empty)
+wxString wxWindowBase::GetHelpText() const
+{
+    wxString text;
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        text = helpProvider->GetHelp(this);
+    }
+
+    return text;
+}
+
+// show help for this window
+void wxWindowBase::OnHelp(wxHelpEvent& event)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        if ( helpProvider->ShowHelp(this) )
+        {
+            // skip the event.Skip() below
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+#endif // wxUSE_HELP
+

 // ----------------------------------------------------------------------------
 // tooltips
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // tooltips
 // ----------------------------------------------------------------------------


@@ -1332,6 +1471,58 @@ void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
     TransferDataToWindow();
 }
 
     TransferDataToWindow();
 }
 

+// process Ctrl-Alt-mclick
+void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
+{
+    if ( event.ControlDown() && event.AltDown() )
+    {
+        // don't translate these strings
+        wxString port;
+        switch ( wxGetOsVersion() )
+        {
+            case wxMOTIF_X:     port = _T("Motif"); break;
+            case wxMACINTOSH:   port = _T("Mac"); break;
+            case wxBEOS:        port = _T("BeOS"); break;
+            case wxGTK:
+            case wxGTK_WIN32:
+            case wxGTK_OS2:
+            case wxGTK_BEOS:    port = _T("GTK"); break;
+            case wxWINDOWS:
+            case wxPENWINDOWS:
+            case wxWINDOWS_NT:
+            case wxWIN32S:
+            case wxWIN95:
+            case wxWIN386:      port = _T("MS Windows"); break;
+            case wxMGL_UNIX:
+            case wxMGL_X:
+            case wxMGL_WIN32:
+            case wxMGL_OS2:     port = _T("MGL"); break;
+            case wxWINDOWS_OS2:
+            case wxOS2_PM:      port = _T("OS/2"); break;
+            default:            port = _T("unknown"); break;
+        }
+
+        wxMessageBox(wxString::Format(
+                                      _T(
+                                        "       wxWindows Library (%s port)\nVersion %u.%u.%u, compiled at %s %s\n   Copyright (c) 1995-2000 wxWindows team"
+                                        ),
+                                      port.c_str(),
+                                      wxMAJOR_VERSION,
+                                      wxMINOR_VERSION,
+                                      wxRELEASE_NUMBER,
+                                      __DATE__,
+                                      __TIME__
+                                     ),
+                     _T("wxWindows information"),
+                     wxICON_INFORMATION | wxOK,
+                     (wxWindow *)this);
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+

 // ----------------------------------------------------------------------------
 // list classes implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // list classes implementation
 // ----------------------------------------------------------------------------