Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index 3d07cfa5599b6bdfccef1723d2db1c9a6b479eca..9228596daaa70a5fb3388ff180291c1d0ca5361c 100644 (file)
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -22,8 +22,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
 
 
 class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
 

-extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerWidgetNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerCtrlNameStr[];

 
 // show the colour in HTML form (#AABBCC) as colour button label
 #define wxCLRBTN_SHOW_LABEL     100
 
 // show the colour in HTML form (#AABBCC) as colour button label
 #define wxCLRBTN_SHOW_LABEL     100


@@ -98,7 +98,7 @@ protected:
 class WXDLLIMPEXP_CORE wxColourPickerCtrl : public wxPickerBase
 {
 public:
 class WXDLLIMPEXP_CORE wxColourPickerCtrl : public wxPickerBase
 {
 public:

-    wxColourPickerCtrl() : m_bIgnoreNextTextCtrlUpdate(false) {}
+    wxColourPickerCtrl() {}

     virtual ~wxColourPickerCtrl() {}
 
 
     virtual ~wxColourPickerCtrl() {}
 
 


@@ -107,7 +107,6 @@ public:
         const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxColourPickerCtrlNameStr)
         const wxSize& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxColourPickerCtrlNameStr)

-        : m_bIgnoreNextTextCtrlUpdate(false)

         { Create(parent, id, col, pos, size, style, validator, name); }
 
     bool Create(wxWindow *parent, wxWindowID id,
         { Create(parent, id, col, pos, size, style, validator, name); }
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -148,9 +147,6 @@ protected:
     virtual long GetPickerStyle(long style) const
         { return (style & wxCLRP_SHOW_LABEL); }
 
     virtual long GetPickerStyle(long style) const
         { return (style & wxCLRP_SHOW_LABEL); }
 

-    // true if the next UpdateTextCtrl() call is to ignore
-    bool m_bIgnoreNextTextCtrlUpdate;
-

 private:
     DECLARE_DYNAMIC_CLASS(wxColourPickerCtrl)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxColourPickerCtrl)
 };


@@ -160,7 +156,7 @@ private:
 // wxColourPickerEvent: used by wxColourPickerCtrl only
 // ----------------------------------------------------------------------------
 
 // wxColourPickerEvent: used by wxColourPickerCtrl only
 // ----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_COLOURPICKER_CHANGED;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent );

 
 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {
 
 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {


@@ -193,7 +189,7 @@ private:
 typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
 
 #define wxColourPickerEventHandler(func) \
 typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
 
 #define wxColourPickerEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxColourPickerEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxColourPickerEventFunction, func)

 
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))
 
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))