Use proper format in wxGTK clipboard selection handler.

[wxWidgets.git] / include / wx / msw / panel.h

diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h
index 5073fe30baddb903d80e5c32dd84fc0faa3ef737..7789a31d7719aea5e6671a4e54ffd8de9635b864 100644 (file)
--- a/include/wx/msw/panel.h
+++ b/include/wx/msw/panel.h
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
 // Purpose:     wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush;
 class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:
 class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:

-    wxPanel() { Init(); }
+    wxPanel() { }

 
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
 
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,


@@ -29,8 +29,6 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {

-        Init();
-

         Create(parent, winid, pos, size, style, name);
     }
 
         Create(parent, winid, pos, size, style, name);
     }
 


@@ -40,7 +38,7 @@ public:
     virtual bool HasTransparentBackground();
 
 
     virtual bool HasTransparentBackground();
 
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,


@@ -52,18 +50,7 @@ public:
     )
 #endif // WXWIN_COMPATIBILITY_2_8
 
     )
 #endif // WXWIN_COMPATIBILITY_2_8
 

-protected:
-    void Init()
-    {
-        m_backgroundBrush = NULL;
-    }
-
-    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp);
-    virtual WXHBRUSH MSWGetCustomBgBrush();
-

 private:
 private:

-    wxBrush *m_backgroundBrush;
-

     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };