added test for writing empty value to the config

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 24cc14c0b4968dbf13260852d5115f3b76247400..4f64c38725bc7374adb6c8e9c8fe96bf1ef3581b 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -419,7 +419,7 @@ public:
 
     void CopyObject(wxObject& obj) const;
 
 
     void CopyObject(wxObject& obj) const;
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

     bool Checked() const { return IsChecked(); }
 #endif // WXWIN_COMPATIBILITY_2
 
     bool Checked() const { return IsChecked(); }
 #endif // WXWIN_COMPATIBILITY_2
 


@@ -506,8 +506,6 @@ public:
 
 class WXDLLEXPORT wxScrollWinEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxScrollWinEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)
-

 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);
 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);


@@ -523,9 +521,12 @@ public:
     void SetPosition(int pos) { m_commandInt = pos; }
 
     void CopyObject(wxObject& object_dest) const;
     void SetPosition(int pos) { m_commandInt = pos; }
 
     void CopyObject(wxObject& object_dest) const;

+

 public:
     int               m_commandInt;    // Additional information
     long              m_extraLong;
 public:
     int               m_commandInt;    // Additional information
     long              m_extraLong;

+
+    DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)

 };
 
 // Mouse event class
 };
 
 // Mouse event class


@@ -559,8 +560,6 @@ public:
 
 class WXDLLEXPORT wxMouseEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxMouseEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxMouseEvent)
-

 public:
     wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
 
 public:
     wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
 


@@ -582,6 +581,9 @@ public:
     // Was the given button 1,2,3 or any in Down state?
     bool ButtonIsDown(int but) const;
 
     // Was the given button 1,2,3 or any in Down state?
     bool ButtonIsDown(int but) const;
 

+    // Get the button which is changing state (-1 if none)
+    int GetButton() const;
+

     // Find state of shift/control keys
     bool ControlDown() const { return m_controlDown; }
     bool MetaDown() const { return m_metaDown; }
     // Find state of shift/control keys
     bool ControlDown() const { return m_controlDown; }
     bool MetaDown() const { return m_metaDown; }


@@ -706,6 +708,9 @@ public:
     int           m_wheelRotation;
     int           m_wheelDelta;
     int           m_linesPerAction;
     int           m_wheelRotation;
     int           m_wheelDelta;
     int           m_linesPerAction;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMouseEvent)

 };
 
 // Cursor set event
 };
 
 // Cursor set event


@@ -886,6 +891,15 @@ public:
 #endif // debug
 };
 
 #endif // debug
 };
 

+class WXDLLEXPORT wxNcPaintEvent : public wxEvent
+{
+public:
+    wxNcPaintEvent(int id = 0) : wxEvent(id) { SetEventType(wxEVT_NC_PAINT); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxNcPaintEvent)
+};
+

 // Erase background event class
 /*
  wxEVT_ERASE_BACKGROUND
 // Erase background event class
 /*
  wxEVT_ERASE_BACKGROUND


@@ -913,11 +927,22 @@ public:
 
 class WXDLLEXPORT wxFocusEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxFocusEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxFocusEvent)
-

 public:
 public:

-    wxFocusEvent(wxEventType type = wxEVT_NULL, int Id = 0)
-        { m_eventType = type; m_id = Id; }
+    wxFocusEvent(wxEventType type = wxEVT_NULL, int id = 0)
+        { m_eventType = type; m_id = id; m_win = NULL; }
+
+    // the window associated with this event is the window which had focus
+    // before for SET event and the window which will have focus for the KILL
+    // one
+    //
+    // NB: it may be NULL in both cases!
+    wxWindow *GetWindow() const { return m_win; }
+    void SetWindow(wxWindow *win) { m_win = win; }
+
+private:
+    wxWindow *m_win;
+
+    DECLARE_DYNAMIC_CLASS(wxFocusEvent)

 };
 
 // Activate event class
 };
 
 // Activate event class


@@ -1043,10 +1068,7 @@ protected:
 
 class WXDLLEXPORT wxShowEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxShowEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxShowEvent)
-

 public:
 public:

-

     wxShowEvent(int id = 0, bool show = FALSE)
         { m_eventType = wxEVT_SHOW; m_id = id; m_show = show; }
 
     wxShowEvent(int id = 0, bool show = FALSE)
         { m_eventType = wxEVT_SHOW; m_id = id; m_show = show; }
 


@@ -1057,6 +1079,8 @@ public:
 
 protected:
     bool m_show;
 
 protected:
     bool m_show;

+
+    DECLARE_DYNAMIC_CLASS(wxShowEvent)

 };
 
 /*
 };
 
 /*


@@ -1065,11 +1089,17 @@ protected:
 
 class WXDLLEXPORT wxIconizeEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxIconizeEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxIconizeEvent)
-

 public:
 public:

-    wxIconizeEvent(int id = 0)
-        { m_eventType = wxEVT_ICONIZE; m_id = id; }
+    wxIconizeEvent(int id = 0, bool iconized = TRUE)
+        { m_eventType = wxEVT_ICONIZE; m_id = id; m_iconized = iconized; }
+
+    // return true if the frame was iconized, false if restored
+    bool Iconized() const { return m_iconized; }
+
+protected:
+    bool m_iconized;
+
+    DECLARE_DYNAMIC_CLASS(wxIconizeEvent)

 };
 
 /*
 };
 
 /*


@@ -1078,11 +1108,11 @@ public:
 
 class WXDLLEXPORT wxMaximizeEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxMaximizeEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)
-

 public:
 public:

-  wxMaximizeEvent(int id = 0)
-      { m_eventType = wxEVT_MAXIMIZE; m_id = id; }
+    wxMaximizeEvent(int id = 0)
+        { m_eventType = wxEVT_MAXIMIZE; m_id = id; }
+
+    DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)

 };
 
 // Joystick event class
 };
 
 // Joystick event class


@@ -1772,6 +1802,7 @@ typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
 #define EVT_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
 #define EVT_QUERY_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
 #define EVT_PAINT(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, (wxObject *) NULL ),
 #define EVT_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
 #define EVT_QUERY_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
 #define EVT_PAINT(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, (wxObject *) NULL ),

+#define EVT_NC_PAINT(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_NC_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, (wxObject *) NULL ),

 #define EVT_ERASE_BACKGROUND(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_ERASE_BACKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxEraseEventFunction) & func, (wxObject *) NULL ),
 #define EVT_CHAR(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_CHAR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),
 #define EVT_KEY_DOWN(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_KEY_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),
 #define EVT_ERASE_BACKGROUND(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_ERASE_BACKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxEraseEventFunction) & func, (wxObject *) NULL ),
 #define EVT_CHAR(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_CHAR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),
 #define EVT_KEY_DOWN(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_KEY_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),