changed wxString::StartsWidth/EndsWidth to take wxString argument instead of wxChar*

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 0c7b85fb4255bf1de28292127cc773ba2c599b5d..d714bce3c08935bc3602c6f9453b590ea8e3adb7 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "panelg.h"
-#endif
-

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


@@ -34,20 +30,64 @@
     #include "wx/colour.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/colour.h"
     #include "wx/settings.h"
     #include "wx/log.h"

+    #include "wx/panel.h"
+    #include "wx/containr.h"

 #endif
 
 #endif
 

-#include "wx/containr.h"
-#include "wx/panel.h"
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 

+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxPanelStyle )
+
+wxBEGIN_FLAGS( wxPanelStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxPanelStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxPanel)
+    wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+// style wxTAB_TRAVERSAL
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxPanel)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+#else

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

+#endif

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

-    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-

     EVT_SIZE(wxPanel::OnSize)
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
     EVT_SIZE(wxPanel::OnSize)
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)


@@ -57,7 +97,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow)

 
 // ----------------------------------------------------------------------------
 // wxPanel creation
 
 // ----------------------------------------------------------------------------
 // wxPanel creation


@@ -65,7 +105,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {

-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();

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


@@ -74,7 +114,18 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    return wxWindow::Create(parent, id, pos, size, style, name);
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
+
+    // so that non-solid background renders correctly under GTK+:
+    SetThemeEnabled(true);
+
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
+    // Required to get solid control backgrounds under WinCE
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
+
+    return true;

 }
 
 wxPanel::~wxPanel()
 }
 
 wxPanel::~wxPanel()


@@ -92,36 +143,24 @@ void wxPanel::InitDialog()
 // event handlers
 // ----------------------------------------------------------------------------
 
 // event handlers
 // ----------------------------------------------------------------------------
 

-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-
-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-}
-

 void wxPanel::OnSize(wxSizeEvent& event)
 {
 void wxPanel::OnSize(wxSizeEvent& event)
 {

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

-#endif // wxUSE_CONSTRAINTS
-
-    //
-    // Need to properly move child windows under OS/2
-    //
-#if defined(__WXPM__)
+#if wxUSE_CONSTRAINTS
+#if defined(__WXPM__) && 0

     else
     {
     else
     {

+        // Need to properly move child windows under OS/2
+

         PSWP                        pWinSwp = GetSwp();
 
         if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
         PSWP                        pWinSwp = GetSwp();
 
         if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)

-            //
+        {

             // Uninitialized
             // Uninitialized

-            //
+

             ::WinQueryWindowPos(GetHWND(), pWinSwp);
             ::WinQueryWindowPos(GetHWND(), pWinSwp);

+        }

         else
         {
             SWP                     vSwp;
         else
         {
             SWP                     vSwp;


@@ -135,6 +174,7 @@ void wxPanel::OnSize(wxSizeEvent& event)
         }
     }
 #endif
         }
     }
 #endif

+#endif // wxUSE_CONSTRAINTS
+

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

-