moved wxCollapsiblePane to core from adv

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-04 20:03:48 +00:00
parent 7ac21a6761
commit 3c6fa82663
4 changed files with 11 additions and 12 deletions

View File

@@ -655,6 +655,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/choicdgg.cpp src/generic/choicdgg.cpp
src/generic/choicbkg.cpp src/generic/choicbkg.cpp
src/generic/clrpickerg.cpp src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/generic/combog.cpp src/generic/combog.cpp
src/generic/dcpsg.cpp src/generic/dcpsg.cpp
src/generic/dirctrlg.cpp src/generic/dirctrlg.cpp
@@ -689,6 +690,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/choicdlg.h wx/choicdlg.h
wx/choice.h wx/choice.h
wx/cmndata.h wx/cmndata.h
wx/collpane.h
wx/combo.h wx/combo.h
wx/combobox.h wx/combobox.h
wx/control.h wx/control.h
@@ -984,6 +986,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/checkbox.cpp src/gtk/checkbox.cpp
src/gtk/checklst.cpp src/gtk/checklst.cpp
src/gtk/choice.cpp src/gtk/choice.cpp
src/gtk/collpane.cpp
src/gtk/colordlg.cpp src/gtk/colordlg.cpp
src/gtk/combobox.cpp src/gtk/combobox.cpp
src/gtk/control.cpp src/gtk/control.cpp
@@ -1032,6 +1035,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/button.h wx/gtk/button.h
wx/gtk/checkbox.h wx/gtk/checkbox.h
wx/gtk/checklst.h wx/gtk/checklst.h
wx/gtk/collpane.h
wx/gtk/colordlg.h wx/gtk/colordlg.h
wx/gtk/choice.h wx/gtk/choice.h
wx/gtk/combobox.h wx/gtk/combobox.h
@@ -2635,7 +2639,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/aboutdlgg.cpp src/generic/aboutdlgg.cpp
src/generic/bmpcboxg.cpp src/generic/bmpcboxg.cpp
src/generic/calctrl.cpp src/generic/calctrl.cpp
src/generic/collpaneg.cpp
src/generic/datavgen.cpp src/generic/datavgen.cpp
src/generic/datectlg.cpp src/generic/datectlg.cpp
src/generic/grid.cpp src/generic/grid.cpp
@@ -2657,7 +2660,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/animdecod.h wx/animdecod.h
wx/bmpcbox.h wx/bmpcbox.h
wx/calctrl.h wx/calctrl.h
wx/collpane.h
wx/dataview.h wx/dataview.h
wx/dateevt.h wx/dateevt.h
wx/dcbuffer.h wx/dcbuffer.h
@@ -2665,7 +2667,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/aboutdlgg.h wx/generic/aboutdlgg.h
wx/generic/bmpcbox.h wx/generic/bmpcbox.h
wx/generic/calctrl.h wx/generic/calctrl.h
wx/generic/collpaneg.h
wx/generic/datectrl.h wx/generic/datectrl.h
wx/generic/dataview.h wx/generic/dataview.h
wx/generic/grid.h wx/generic/grid.h
@@ -2782,7 +2783,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/animateg.cpp src/generic/animateg.cpp
src/gtk/aboutdlg.cpp src/gtk/aboutdlg.cpp
src/gtk/animate.cpp src/gtk/animate.cpp
src/gtk/collpane.cpp
src/gtk/dataview.cpp src/gtk/dataview.cpp
src/gtk/taskbar.cpp src/gtk/taskbar.cpp
src/gtk/eggtrayicon.c src/gtk/eggtrayicon.c
@@ -2790,7 +2790,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ADVANCED_GTK_HDR" hints="files"> <set var="ADVANCED_GTK_HDR" hints="files">
wx/generic/animate.h wx/generic/animate.h
wx/gtk/animate.h wx/gtk/animate.h
wx/gtk/collpane.h
</set> </set>
<set var="ADVANCED_GTK1_SRC" hints="files"> <set var="ADVANCED_GTK1_SRC" hints="files">

View File

@@ -27,7 +27,7 @@
#define wxCP_DEFAULT_STYLE (wxNO_BORDER) #define wxCP_DEFAULT_STYLE (wxNO_BORDER)
#define wxCP_NO_TLW_RESIZE (0x0002) #define wxCP_NO_TLW_RESIZE (0x0002)
class WXDLLIMPEXP_ADV wxCollapsiblePaneBase : public wxControl class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl
{ {
public: public:
wxCollapsiblePaneBase() {} wxCollapsiblePaneBase() {}
@@ -50,10 +50,10 @@ public:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_COLLPANE_CHANGED, 1102) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, 1102)
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
class WXDLLIMPEXP_ADV wxCollapsiblePaneEvent : public wxCommandEvent class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
{ {
public: public:
wxCollapsiblePaneEvent() {} wxCollapsiblePaneEvent() {}

View File

@@ -19,14 +19,14 @@ class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticLine; class WXDLLEXPORT wxStaticLine;
// class name // class name
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGenericCollapsiblePaneNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxGenericCollapsiblePaneNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGenericCollapsiblePane // wxGenericCollapsiblePane
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxGenericCollapsiblePane : public wxCollapsiblePaneBase class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase
{ {
public: public:
wxGenericCollapsiblePane() { Init(); } wxGenericCollapsiblePane() { Init(); }

View File

@@ -14,13 +14,13 @@
#include "wx/generic/collpaneg.h" #include "wx/generic/collpaneg.h"
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxCollapsiblePaneNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxCollapsiblePane // wxCollapsiblePane
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxCollapsiblePane : public wxGenericCollapsiblePane class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxGenericCollapsiblePane
{ {
public: public:
wxCollapsiblePane() { Init(); } wxCollapsiblePane() { Init(); }