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 b5d55538143d3b806bfdcfac9bb8df91299c03f9..5824c0efc43890083e62523cdcd72b0d016255e7 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -21,13 +21,13 @@
 
 class WXDLLIMPEXP_FWD_CORE wxControlContainer;
 
 
 class WXDLLIMPEXP_FWD_CORE wxControlContainer;
 

-extern WXDLLEXPORT_DATA(const char) 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(); }


@@ -70,9 +70,6 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-        // calls layout for layout constraints and sizers
-    void OnSize(wxSizeEvent& event);
-

     virtual void InitDialog();
 
 #ifdef __WXUNIVERSAL__
     virtual void InitDialog();
 
 #ifdef __WXUNIVERSAL__