Export recently added wxRichTextXMLHelper to fix link errors.

[wxWidgets.git] / include / wx / tglbtn.h

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index ccb80dce96a6c20bf60ea0b0f229b583f0000d46..8cb2a2e8914bef9ee9c50ceaf4eefbf3bff80029 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -5,9 +5,8 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Johnny C. Norris II
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     wxWindows Licence
+// Licence:     wxWindows Licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_BASE_


@@ -18,15 +17,17 @@
 #if wxUSE_TOGGLEBTN
 
 #include "wx/event.h"
 #if wxUSE_TOGGLEBTN
 
 #include "wx/event.h"

-#include "wx/control.h"     // base class
+#include "wx/anybutton.h"     // base class

 
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOGGLEBUTTON_CLICKED;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
+
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOGGLEBUTTON, wxCommandEvent );

 
 // ----------------------------------------------------------------------------
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton

 {
 public:
     wxToggleButtonBase() { }
 {
 public:
     wxToggleButtonBase() { }


@@ -65,31 +66,35 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 

-    DECLARE_NO_COPY_CLASS(wxToggleButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxToggleButtonBase);

 };
 
 
 #define EVT_TOGGLEBUTTON(id, fn) \
 };
 
 
 #define EVT_TOGGLEBUTTON(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TOGGLEBUTTON, id, wxCommandEventHandler(fn))

 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/tglbtn.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/tglbtn.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"

+    #define wxHAS_BITMAPTOGGLEBUTTON

 #elif defined(__WXGTK20__)
     #include "wx/gtk/tglbtn.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/tglbtn.h"

+    #define wxHAS_BITMAPTOGGLEBUTTON

 #elif defined(__WXGTK__)
     #include "wx/gtk1/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"

-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/tglbtn.h"
+    #define wxHAS_BITMAPTOGGLEBUTTON

 #elif defined(__WXPM__)
     #include "wx/os2/tglbtn.h"
 #endif
 
 #elif defined(__WXPM__)
     #include "wx/os2/tglbtn.h"
 #endif
 

+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED   wxEVT_TOGGLEBUTTON
+

 #endif // wxUSE_TOGGLEBTN
 
 #endif // _WX_TOGGLEBUTTON_H_BASE_
 #endif // wxUSE_TOGGLEBTN
 
 #endif // _WX_TOGGLEBUTTON_H_BASE_