don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index cf5685d9489df58d667b09422f7ee2ed471c60e4..5824c0efc43890083e62523cdcd72b0d016255e7 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PANEL_H_
 #define _WX_GENERIC_PANEL_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PANEL_H_
 #define _WX_GENERIC_PANEL_H_
 

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

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


@@ -23,15 +19,15 @@
 #include "wx/window.h"
 #include "wx/containr.h"
 
 #include "wx/window.h"
 #include "wx/containr.h"
 

-class WXDLLEXPORT wxControlContainer;
+class WXDLLIMPEXP_FWD_CORE wxControlContainer;

 
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];

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

-class WXDLLEXPORT wxPanel : public wxWindow
+class WXDLLIMPEXP_CORE wxPanel : public wxWindow

 {
 public:
     wxPanel() { Init(); }
 {
 public:
     wxPanel() { Init(); }


@@ -45,12 +41,12 @@ public:
     {
         Init();
 
     {
         Init();
 

-        Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);

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

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

             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,


@@ -58,11 +54,12 @@ 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 = wxID_ANY,

                 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,


@@ -73,15 +70,11 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    // Sends an OnInitDialog event, which in turns transfers data to
-    // to the dialog via validators.

     virtual void InitDialog();
 
     virtual void InitDialog();
 

-        // responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-        // calls layout for layout constraints and sizers
-    void OnSize(wxSizeEvent& event);
+#ifdef __WXUNIVERSAL__
+    virtual bool IsCanvasWindow() const { return true; }
+#endif

 
     WX_DECLARE_CONTROL_CONTAINER();
 
 
     WX_DECLARE_CONTROL_CONTAINER();
 


@@ -89,8 +82,10 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxPanel)
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); }
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };