SetSelection() for generic wxSpinCtrl (forgot to commit before)

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 9f3813167a9384ab4d304dc44c9a79aea89d98a4..0c7b85fb4255bf1de28292127cc773ba2c599b5d 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,48 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        panelg.cpp
-// Purpose:     wxPanel
-// Author:      Julian Smart
+// Name:        src/generic/panelg.cpp
+// Purpose:     wxPanel and the keyboard handling code
+// Author:      Julian Smart, Robert Roebling, Vadim Zeitlin

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:           wxWindows license
+// Licence:     wxWindows license

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

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "panelg.h"
+    #pragma implementation "panelg.h"

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/object.h"
-#include "wx/font.h"
-#include "wx/colour.h"
-#include "wx/settings.h"
+    #include "wx/object.h"
+    #include "wx/font.h"
+    #include "wx/colour.h"
+    #include "wx/settings.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/generic/panelg.h"
+#include "wx/containr.h"
+#include "wx/panel.h"
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)

-  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-  EVT_SET_FOCUS(wxPanel::OnFocus)
-  EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
+    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
+
+    EVT_SIZE(wxPanel::OnSize)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+
+// ----------------------------------------------------------------------------
+// wxPanel creation
+// ----------------------------------------------------------------------------

 
 

-wxPanel::wxPanel()
+void wxPanel::Init()

 {
 {

-    m_lastFocus = NULL;
+    m_container.SetContainerWindow(this);

 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,


@@ -51,120 +74,67 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    m_lastFocus = NULL;
-
-    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
-
-    if ( ret )
-    {
-#ifndef __WXGTK__
-        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-#endif
-    }
+    return wxWindow::Create(parent, id, pos, size, style, name);
+}

 
 

-    return ret;
+wxPanel::~wxPanel()
+{

 }
 
 }
 

-void wxPanel::InitDialog(void)
+void wxPanel::InitDialog()

 {
     wxInitDialogEvent event(GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
 {
     wxInitDialogEvent event(GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+

 // Responds to colour changes, and passes event on to children.
 void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

     Refresh();
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
     Refresh();
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 

-void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
+void wxPanel::OnSize(wxSizeEvent& event)

 {
 {

-    // there is not much to do if we have only one child (or not at all)
-    if (GetChildren().GetCount() < 2)
-    {
-        event.Skip();
-        return;
-    }
-
-    // don't process these ones here
-    if (event.IsWindowChange())
-    {
-        event.Skip();
-        return;
-    }
-
-    wxWindow *winFocus = event.GetCurrentFocus();
-    if (!winFocus)
-        winFocus = wxWindow::FindFocus();
-
-    if (!winFocus)
-    {
-        event.Skip();
-        return;
-    }
-
-    wxNode *start_node = GetChildren().Find( winFocus );
-    if (!start_node)
-        start_node = GetChildren().First();
-
-    wxNode *node = event.GetDirection() ? start_node->Next()
-                                        : start_node->Previous();
-
-    while (node != start_node)
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif // wxUSE_CONSTRAINTS
+
+    //
+    // Need to properly move child windows under OS/2
+    //
+#if defined(__WXPM__)
+    else

     {
     {

-        if (!node)
+        PSWP                        pWinSwp = GetSwp();
+
+        if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
+            //
+            // Uninitialized
+            //
+            ::WinQueryWindowPos(GetHWND(), pWinSwp);
+        else

         {
         {

-//#if 0 // FIXME seems to enter in an infinite loop - how is this possible?
-            // we arrived at the last/first of our children - but may be this
-            // panel is inside another panel, so make focus go to the next/prev
-            // control in the parent (if we have one)
-            if (GetParent() != NULL)
-            {
-                wxNavigationKeyEvent new_event;
-                new_event.SetDirection( event.GetDirection() );
-                new_event.SetWindowChange(FALSE);
-                new_event.SetCurrentFocus( this );
-
-                if (GetParent()->GetEventHandler()->ProcessEvent(new_event))
-                {
-                    return;
-                }
-            }
-//#endif // 0
-
-            node = event.GetDirection() ? GetChildren().First()
-                                        : GetChildren().Last();
-
-            continue;
+            SWP                     vSwp;
+            int                     nYDiff;
+
+            ::WinQueryWindowPos(GetHWND(), &vSwp);
+            nYDiff = pWinSwp->cy - vSwp.cy;
+            MoveChildren(nYDiff);
+            pWinSwp->cx = vSwp.cx;
+            pWinSwp->cy = vSwp.cy;

         }
         }

-
-        wxWindow *child = (wxWindow *)node->Data();
-
-        if (child->AcceptsFocus())
-        {
-            // ok, event processed
-            child->SetFocus();
-            return;
-        }
-
-        node = event.GetDirection() ? node->Next() : node->Previous();

     }
     }

-
-    // we cycled through all of our children and none of them wanted to accept
-    // focus
+#endif

     event.Skip();
 }
 
     event.Skip();
 }
 

-void wxPanel::OnFocus(wxFocusEvent& event)
-{
-    if ( m_lastFocus )
-        m_lastFocus->SetFocus();
-    else
-        event.Skip();
-}