fixed duplicate inclusion of jpeg source

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

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index a18213ae87138a4386ea4f875645be7073b20450..2df1170cb9a2a073044cb3c5e48ea8760f458ea5 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -159,7 +159,7 @@ class WXDLLEXPORT wxPropertyListView: public wxPropertyView
   inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
   inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
   inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }
   inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
   inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
   inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }

-  
+

   bool OnClose(void);
 
 public:
   bool OnClose(void);
 
 public:


@@ -177,15 +177,18 @@ public:
 
   static wxBitmap*  sm_tickBitmap;
   static wxBitmap*  sm_crossBitmap;
 
   static wxBitmap*  sm_tickBitmap;
   static wxBitmap*  sm_crossBitmap;

-  
+

   wxPanel*          m_propertyWindow; // Panel that the controls will appear on
   wxWindow*         m_managedWindow; // Frame or dialog
   wxPanel*          m_propertyWindow; // Panel that the controls will appear on
   wxWindow*         m_managedWindow; // Frame or dialog

-  
+

   wxButton*         m_windowCloseButton; // Or OK
   wxButton*         m_windowCancelButton;
   wxButton*         m_windowHelpButton;
 
 DECLARE_EVENT_TABLE()
   wxButton*         m_windowCloseButton; // Or OK
   wxButton*         m_windowCancelButton;
   wxButton*         m_windowHelpButton;
 
 DECLARE_EVENT_TABLE()

+private:
+  virtual void ShowView(wxPropertySheet *propertySheet, wxWindow *window)
+  { wxPropertyView::ShowView(propertySheet, window); };

 };
 
 class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl
 };
 
 class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl


@@ -206,7 +209,7 @@ class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl
 /*
  * The type of validator used for property lists (Visual Basic style)
  */
 /*
  * The type of validator used for property lists (Visual Basic style)
  */

- 
+

 class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)
 class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 {
   DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)


@@ -221,7 +224,7 @@ class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 
    // Called when the property is double clicked. Extra functionality can be provided, such as
    // cycling through possible values.
 
    // Called when the property is double clicked. Extra functionality can be provided, such as
    // cycling through possible values.

-   inline virtual bool OnDoubleClick( 
+   inline virtual bool OnDoubleClick(

      wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
      { return TRUE; }
 
      wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
      { return TRUE; }
 


@@ -268,7 +271,7 @@ class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
 /*
  * A default dialog box class to use.
  */
 /*
  * A default dialog box class to use.
  */

- 
+

 class WXDLLEXPORT wxPropertyListDialog: public wxDialog
 {
   DECLARE_CLASS(wxPropertyListDialog)
 class WXDLLEXPORT wxPropertyListDialog: public wxDialog
 {
   DECLARE_CLASS(wxPropertyListDialog)


@@ -276,7 +279,7 @@ class WXDLLEXPORT wxPropertyListDialog: public wxDialog
   wxPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");
   wxPropertyListDialog(wxPropertyListView *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 OnCancel(wxCommandEvent& event);
 
   void OnDefaultAction(wxControl *item);
   void OnCancel(wxCommandEvent& event);
 


@@ -292,7 +295,7 @@ DECLARE_EVENT_TABLE()
 /*
  * A default panel class to use.
  */
 /*
  * A default panel class to use.
  */

- 
+

 class WXDLLEXPORT wxPropertyListPanel: public wxPanel
 {
   DECLARE_CLASS(wxPropertyListPanel)
 class WXDLLEXPORT wxPropertyListPanel: public wxPanel
 {
   DECLARE_CLASS(wxPropertyListPanel)


@@ -325,7 +328,7 @@ DECLARE_EVENT_TABLE()
 /*
  * A default frame class to use.
  */
 /*
  * A default frame class to use.
  */

- 
+

 class WXDLLEXPORT wxPropertyListFrame: public wxFrame
 {
   DECLARE_CLASS(wxPropertyListFrame)
 class WXDLLEXPORT wxPropertyListFrame: public wxFrame
 {
   DECLARE_CLASS(wxPropertyListFrame)


@@ -338,7 +341,7 @@ class WXDLLEXPORT wxPropertyListFrame: 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);


@@ -348,12 +351,14 @@ class WXDLLEXPORT wxPropertyListFrame: public wxFrame
  private:
   wxPropertyListView*       m_view;
   wxPropertyListPanel*      m_propertyPanel;
  private:
   wxPropertyListView*       m_view;
   wxPropertyListPanel*      m_propertyPanel;

+
+DECLARE_EVENT_TABLE()

 };
 
 /*
  * Some default validators
  */
 };
 
 /*
  * Some default validators
  */

- 
+

 class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)
 class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxRealListValidator)


@@ -470,7 +475,7 @@ class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator
  protected:
   wxStringList*     m_strings;
 };
  protected:
   wxStringList*     m_strings;
 };

- 
+

 class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
 class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
 {
   DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)


@@ -499,7 +504,7 @@ class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
  protected:
   wxString  m_filenameWildCard;
   wxString  m_filenameMessage;
  protected:
   wxString  m_filenameWildCard;
   wxString  m_filenameMessage;

-  
+

 };
 
 class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator
 };
 
 class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator


@@ -549,7 +554,7 @@ class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
    // Called when the property is double clicked.
    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
    // Called when the property is double clicked.
    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 

-   bool EditStringList(wxWindow *parent, wxStringList *stringList, const char *title = "String List Editor");
+   bool EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title = _T("String List Editor"));

 
    // Called when the edit (...) button is pressed.
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
    // Called when the edit (...) button is pressed.
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);