fix for non-unicode DMC builds

[wxWidgets.git] / include / wx / generic / panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index f47c9afc4199667d95682efe0342a2d6ee58028b..b79a59e0f4906f721497a4830e8ddaa3a64987d6 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -1,31 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        panelg.h
-// Purpose:     wxPanel: similar to wxWindows but is coloured as for a dialog
+// Name:        wx/generic/panelg.h
+// Purpose:     wxPanel: a container for child controls

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

-#ifndef __PANELH_G__
-#define __PANELH_G__
+#ifndef _WX_GENERIC_PANEL_H_
+#define _WX_GENERIC_PANEL_H_

 
 

-#ifdef __GNUG__
-#pragma interface "panelg.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "panelg.h"

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// headers and forward declarations
+// ----------------------------------------------------------------------------
+

 #include "wx/window.h"
 #include "wx/window.h"

-#include "wx/button.h"
+#include "wx/containr.h"
+
+class WXDLLEXPORT wxControlContainer;

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 

+// ----------------------------------------------------------------------------
+// wxPanel contains other controls and implements TAB traversal between them
+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
     wxPanel() { Init(); }
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
     wxPanel() { Init(); }

-    
+

     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
     wxPanel(wxWindow *parent,
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
     wxPanel(wxWindow *parent,


@@ -37,10 +47,10 @@ public:
 
         Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
     }
 
         Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
     }

-    
+

     // Constructor
     wxPanel(wxWindow *parent,
     // Constructor
     wxPanel(wxWindow *parent,

-            wxWindowID id = -1,
+            wxWindowID winid = -1,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,


@@ -48,54 +58,44 @@ public:
     {
         Init();
 
     {
         Init();
 

-        Create(parent, id, pos, size, style, name);
+        Create(parent, winid, pos, size, style, name);

     }
 
     // Pseudo ctor
     }
 
     // Pseudo ctor

-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID winid,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
                 const wxString& name = wxPanelNameStr);
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
                 const wxString& name = wxPanelNameStr);

-    
-    // Sends an OnInitDialog event, which in turns transfers data to
-    // to the dialog via validators.
-    virtual void InitDialog();

 
 

-    // a default button is activated when Enter is pressed
-    wxButton *GetDefaultItem() const { return m_btnDefault; }
-    void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; }
+    virtual ~wxPanel();

 
     // implementation from now on
     // --------------------------
 
         // responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // implementation from now on
     // --------------------------
 
         // responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);

-    
-        // process a keyboard navigation message (Tab traversal)
-    void OnNavigationKey(wxNavigationKeyEvent& event);
-    
-        // set the focus to the first child if we get it
-    void OnFocus(wxFocusEvent& event);

 
 

-        // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+        // calls layout for layout constraints and sizers
+    void OnSize(wxSizeEvent& event);
+
+    virtual void InitDialog();
+
+#ifdef __WXUNIVERSAL__
+    virtual bool IsCanvasWindow() const { return TRUE; }
+    virtual bool ProvidesBackground() const { return TRUE; }
+#endif
+
+    WX_DECLARE_CONTROL_CONTAINER();

 
 protected:
     // common part of all ctors
     void Init();
 
 
 protected:
     // common part of all ctors
     void Init();
 

-    // the child which had the focus last time this panel was activated
-    wxWindow *m_winLastFocused;
-
-    // a default button or NULL
-    wxButton *m_btnDefault;
-

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)

     DECLARE_EVENT_TABLE()
 };
 
 #endif
     DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // __PANELH_G__
+    // _WX_GENERIC_PANEL_H_