converted to 16 colors

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

diff --git a/include/wx/propform.h b/include/wx/propform.h
index ede043929e4be991b051cb78423f5a634fcbf6c8..4acff593bb97dcd3d1325a84a66d9e64bab91e1c 100644 (file)
--- a/include/wx/propform.h
+++ b/include/wx/propform.h
@@ -61,7 +61,7 @@ class WXDLLEXPORT wxPropertyFormView: public wxPropertyView
   void OnUpdate(wxCommandEvent& event);
   void OnRevert(wxCommandEvent& event);
 
   void OnUpdate(wxCommandEvent& event);
   void OnRevert(wxCommandEvent& event);
 

-  virtual bool OnClose(void);
+  virtual bool OnClose();

   virtual void OnDoubleClick(wxControl *item);
 
   // TODO: does OnCommand still get called...???
   virtual void OnDoubleClick(wxControl *item);
 
   // TODO: does OnCommand still get called...???


@@ -230,7 +230,8 @@ class WXDLLEXPORT wxPropertyFormDialog: public wxDialog
   wxPropertyFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");
   wxPropertyFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");

-  bool OnClose(void);
+
+  void OnCloseWindow(wxCloseEvent& event);

   void OnDefaultAction(wxControl *item);
   void OnCommand(wxWindow& win, wxCommandEvent& event);
 
   void OnDefaultAction(wxControl *item);
   void OnCommand(wxWindow& win, wxCommandEvent& event);
 


@@ -239,6 +240,8 @@ class WXDLLEXPORT wxPropertyFormDialog: public wxDialog
 
  private:
   wxPropertyFormView*       m_view;
 
  private:
   wxPropertyFormView*       m_view;

+
+DECLARE_EVENT_TABLE()

 };
 
 /*
 };
 
 /*


@@ -281,7 +284,7 @@ class WXDLLEXPORT wxPropertyFormFrame: public wxFrame
     m_view = v;
     m_propertyPanel = NULL;
   }
     m_view = v;
     m_propertyPanel = NULL;
   }

-  bool OnClose(void);
+  void OnCloseWindow(wxCloseEvent& event);

 
   // Must call this to create panel and associate view
   virtual bool Initialize(void);
 
   // Must call this to create panel and associate view
   virtual bool Initialize(void);


@@ -291,6 +294,8 @@ class WXDLLEXPORT wxPropertyFormFrame: public wxFrame
  private:
   wxPropertyFormView*       m_view;
   wxPanel*                  m_propertyPanel;
  private:
   wxPropertyFormView*       m_view;
   wxPanel*                  m_propertyPanel;

+
+DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif