fixed bug in DeleteEntry()

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 028c27fe4f1d8c481cab74a703365da53fd927d6..3aa0a3e0d2fbf70c5746f8a6e8305e5cfdebefc5 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -12,70 +12,100 @@
 #ifndef _WX_CMNDATA_H_BASE_
 #define _WX_CMNDATA_H_BASE_
 
 #ifndef _WX_CMNDATA_H_BASE_
 #define _WX_CMNDATA_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "cmndata.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/font.h"
 #pragma interface "cmndata.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/font.h"

+#include "wx/encinfo.h"

 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 

-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
-class WXDLLEXPORT wxPrintSetupData;
-#endif
-

 class WXDLLEXPORT wxColourData: public wxObject
 {
 class WXDLLEXPORT wxColourData: public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxColourData)

 public:
     wxColourData();
     wxColourData(const wxColourData& data);
     ~wxColourData();
 
 public:
     wxColourData();
     wxColourData(const wxColourData& data);
     ~wxColourData();
 

-    void SetChooseFull(bool flag) { chooseFull = flag; }
-    bool GetChooseFull() const { return chooseFull; }
-    void SetColour(wxColour& colour) { dataColour = colour; }
-    wxColour &GetColour() { return dataColour; }
+    void SetChooseFull(bool flag) { m_chooseFull = flag; }
+    bool GetChooseFull() const { return m_chooseFull; }
+    void SetColour(const wxColour& colour) { m_dataColour = colour; }
+    const wxColour& GetColour() const { return m_dataColour; }
+    wxColour& GetColour() { return m_dataColour; }

 
     // Array of 16 custom colours
 
     // Array of 16 custom colours

-    void SetCustomColour(int i, wxColour& colour);
+    void SetCustomColour(int i, const wxColour& colour);

     wxColour GetCustomColour(int i);
 
     void operator=(const wxColourData& data);
 
 public:
     wxColour GetCustomColour(int i);
 
     void operator=(const wxColourData& data);
 
 public:

-    wxColour        dataColour;
-    wxColour        custColours[16];
-    bool            chooseFull;
+    wxColour        m_dataColour;
+    wxColour        m_custColours[16];
+    bool            m_chooseFull;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxColourData)

 };
 
 class WXDLLEXPORT wxFontData: public wxObject
 {
 };
 
 class WXDLLEXPORT wxFontData: public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxFontData)

 public:
     wxFontData();
     ~wxFontData();
 
 public:
     wxFontData();
     ~wxFontData();
 

-    void SetAllowSymbols(bool flag) { allowSymbols = flag; }
-    bool GetAllowSymbols() const { return allowSymbols; }
-
-    void SetColour(const wxColour& colour) { fontColour = colour; }
-    wxColour &GetColour() { return fontColour; }
-
-    void SetShowHelp(bool flag) { showHelp = flag; }
-    bool GetShowHelp() const { return showHelp; }
-
-    void EnableEffects(bool flag) { enableEffects = flag; }
-    bool GetEnableEffects() const { return enableEffects; }
-
-    void SetInitialFont(const wxFont& font) { initialFont = font; }
-    wxFont GetInitialFont() const { return initialFont; }
-
-    void SetChosenFont(const wxFont& font) { chosenFont = font; }
-    wxFont GetChosenFont() const { return chosenFont; }
-
-    void SetRange(int minRange, int maxRange) { minSize = minRange; maxSize = maxRange; }
+    wxFontData(const wxFontData& data)
+        : wxObject()
+        , m_fontColour(data.m_fontColour)
+        , m_showHelp(data.m_showHelp)
+        , m_allowSymbols(data.m_allowSymbols)
+        , m_enableEffects(data.m_enableEffects)
+        , m_initialFont(data.m_initialFont)
+        , m_chosenFont(data.m_chosenFont)
+        , m_minSize(data.m_minSize)
+        , m_maxSize(data.m_maxSize)
+        , m_encoding(data.m_encoding)
+        , m_encodingInfo(data.m_encodingInfo)
+    {
+    }
+
+    wxFontData& operator=(const wxFontData& data)
+    {
+        wxObject::operator=(data);
+        m_fontColour     = data.m_fontColour;
+        m_showHelp       = data.m_showHelp;
+        m_allowSymbols   = data.m_allowSymbols;
+        m_enableEffects  = data.m_enableEffects;
+        m_initialFont    = data.m_initialFont;
+        m_chosenFont     = data.m_chosenFont;
+        m_minSize        = data.m_minSize;
+        m_maxSize        = data.m_maxSize;
+        m_encoding     = data.m_encoding;
+        m_encodingInfo = data.m_encodingInfo;
+        return *this;
+    }
+                          
+    void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
+    bool GetAllowSymbols() const { return m_allowSymbols; }
+
+    void SetColour(const wxColour& colour) { m_fontColour = colour; }
+    wxColour &GetColour() { return m_fontColour; }
+
+    void SetShowHelp(bool flag) { m_showHelp = flag; }
+    bool GetShowHelp() const { return m_showHelp; }
+
+    void EnableEffects(bool flag) { m_enableEffects = flag; }
+    bool GetEnableEffects() const { return m_enableEffects; }
+
+    void SetInitialFont(const wxFont& font) { m_initialFont = font; }
+    wxFont GetInitialFont() const { return m_initialFont; }
+
+    void SetChosenFont(const wxFont& font) { m_chosenFont = font; }
+    wxFont GetChosenFont() const { return m_chosenFont; }
+
+    void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; }

 
     // encoding info is split into 2 parts: the logical wxWin encoding
     // (wxFontEncoding) and a structure containing the native parameters for
 
     // encoding info is split into 2 parts: the logical wxWin encoding
     // (wxFontEncoding) and a structure containing the native parameters for


@@ -86,18 +116,21 @@ public:
     wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
 
 public:
     wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
 
 public:

-    wxColour        fontColour;
-    bool            showHelp;
-    bool            allowSymbols;
-    bool            enableEffects;
-    wxFont          initialFont;
-    wxFont          chosenFont;
-    int             minSize;
-    int             maxSize;
+    wxColour        m_fontColour;
+    bool            m_showHelp;
+    bool            m_allowSymbols;
+    bool            m_enableEffects;
+    wxFont          m_initialFont;
+    wxFont          m_chosenFont;
+    int             m_minSize;
+    int             m_maxSize;

 
 private:
     wxFontEncoding       m_encoding;
     wxNativeEncodingInfo m_encodingInfo;
 
 private:
     wxFontEncoding       m_encoding;
     wxNativeEncodingInfo m_encodingInfo;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxFontData)

 };
 
 #if wxUSE_PRINTING_ARCHITECTURE
 };
 
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -106,10 +139,15 @@ private:
  * Encapsulates printer information (not printer dialog information)
  */
 
  * Encapsulates printer information (not printer dialog information)
  */
 

+#ifdef __WXMAC__
+
+class wxNativePrintData ;
+
+#endif
+

 class WXDLLEXPORT wxPrintData: public wxObject
 {
 class WXDLLEXPORT wxPrintData: public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxPrintData)
-
+public:

     wxPrintData();
     wxPrintData(const wxPrintData& printData);
     ~wxPrintData();
     wxPrintData();
     wxPrintData(const wxPrintData& printData);
     ~wxPrintData();


@@ -118,6 +156,9 @@ class WXDLLEXPORT wxPrintData: public wxObject
     bool GetCollate() const { return m_printCollate; };
     int  GetOrientation() const { return m_printOrientation; };
 
     bool GetCollate() const { return m_printCollate; };
     int  GetOrientation() const { return m_printOrientation; };
 

+    // Is this data OK for showing the print dialog?
+    bool Ok() const ;
+

     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
     wxDuplexMode GetDuplex() const { return m_duplexMode; }
     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
     wxDuplexMode GetDuplex() const { return m_duplexMode; }


@@ -164,11 +205,6 @@ class WXDLLEXPORT wxPrintData: public wxObject
 
     void operator=(const wxPrintData& data);
 
 
     void operator=(const wxPrintData& data);
 

-    // For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
-    void operator=(const wxPrintSetupData& setupData);
-#endif
-

 #if defined(__WXMSW__)
     // Convert to/from the DEVMODE structure
     void ConvertToNative();
 #if defined(__WXMSW__)
     // Convert to/from the DEVMODE structure
     void ConvertToNative();


@@ -177,17 +213,17 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void SetNativeData(void* data) { m_devMode = data; }
     void* GetNativeDataDevNames() const { return m_devNames; }
     void SetNativeDataDevNames(void* data) { m_devNames = data; }
     void SetNativeData(void* data) { m_devMode = data; }
     void* GetNativeDataDevNames() const { return m_devNames; }
     void SetNativeDataDevNames(void* data) { m_devNames = data; }

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__)

   void ConvertToNative();
   void ConvertFromNative();
 #endif
 
 public:
   void ConvertToNative();
   void ConvertFromNative();
 #endif
 
 public:

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     void*           m_devMode;
     void*           m_devNames;
     void*           m_devMode;
     void*           m_devNames;

-#elif defined( __WXMAC__  )
-       THPrint                 m_macPrintInfo ;
+#elif defined(__WXMAC__)
+    wxNativePrintData* m_nativePrintData ;

 #endif
 
 private:
 #endif
 
 private:


@@ -215,6 +251,9 @@ private:
     long            m_printerTranslateX;
     long            m_printerTranslateY;
     wxPrintMode     m_printMode;
     long            m_printerTranslateX;
     long            m_printerTranslateY;
     wxPrintMode     m_printMode;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxPrintData)

 };
 
 /*
 };
 
 /*


@@ -226,8 +265,7 @@ private:
 
 class WXDLLEXPORT wxPrintDialogData: public wxObject
 {
 
 class WXDLLEXPORT wxPrintDialogData: public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
-
+public:

     wxPrintDialogData();
     wxPrintDialogData(const wxPrintDialogData& dialogData);
     wxPrintDialogData(const wxPrintData& printData);
     wxPrintDialogData();
     wxPrintDialogData(const wxPrintDialogData& dialogData);
     wxPrintDialogData(const wxPrintData& printData);


@@ -265,6 +303,9 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
     bool GetEnableHelp() const { return m_printEnableHelp; };
 
     bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
     bool GetEnableHelp() const { return m_printEnableHelp; };
 

+    // Is this data OK for showing the print dialog?
+    bool Ok() const { return m_printData.Ok() ; }
+

     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 


@@ -277,19 +318,16 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }

-#elif defined( __WXMAC__)
-  void ConvertToNative();
-  void ConvertFromNative();
+#elif defined(__WXMAC__)
+    void ConvertToNative();
+    void ConvertFromNative();

 #endif
 
 #ifdef __WXMSW__
     void*           m_printDlgData;
 #endif
 
 #ifdef __WXMSW__
     void*           m_printDlgData;

-#elif defined( __WXMAC__  )
-       THPrint                 m_macPrintInfo ;

 #endif
 
 private:
 #endif
 
 private:

-

     int             m_printFromPage;
     int             m_printToPage;
     int             m_printMinPage;
     int             m_printFromPage;
     int             m_printToPage;
     int             m_printMinPage;


@@ -304,8 +342,10 @@ private:
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;
     bool            m_printSetupDialog;
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;
     bool            m_printSetupDialog;

-

     wxPrintData     m_printData;
     wxPrintData     m_printData;

+
+private:    
+    DECLARE_DYNAMIC_CLASS(wxPrintDialogData)

 };
 
 /*
 };
 
 /*


@@ -317,8 +357,6 @@ private:
 
 class WXDLLEXPORT wxPageSetupDialogData: public wxObject
 {
 
 class WXDLLEXPORT wxPageSetupDialogData: public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
-

 public:
     wxPageSetupDialogData();
     wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);
 public:
     wxPageSetupDialogData();
     wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);


@@ -340,11 +378,14 @@ public:
     bool GetDefaultInfo() const { return m_getDefaultInfo; };
     bool GetEnableHelp() const { return m_enableHelp; };
 
     bool GetDefaultInfo() const { return m_getDefaultInfo; };
     bool GetEnableHelp() const { return m_enableHelp; };
 

+    // Is this data OK for showing the page setup dialog?
+    bool Ok() const { return m_printData.Ok() ; }
+

     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.
     void SetPaperSize(const wxSize& sz);
 
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.
     void SetPaperSize(const wxSize& sz);
 

-    void SetPaperId(wxPaperSize& id) { m_printData.SetPaperId(id); };
+    void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); };

 
     // Sets the wxPrintData id, plus the paper width/height if found in the paper database.
     void SetPaperSize(wxPaperSize id);
 
     // Sets the wxPrintData id, plus the paper width/height if found in the paper database.
     void SetPaperSize(wxPaperSize id);


@@ -368,9 +409,9 @@ public:
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }

-#elif defined( __WXMAC__)
-  void ConvertToNative();
-  void ConvertFromNative();
+#elif defined(__WXMAC__)
+    void ConvertToNative();
+    void ConvertFromNative();

 #endif
 
     // Use paper size defined in this object to set the wxPrintData
 #endif
 
     // Use paper size defined in this object to set the wxPrintData


@@ -380,27 +421,22 @@ public:
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 

-    void operator=(const wxPageSetupData& data);
-    void operator=(const wxPrintData& data);
+    wxPageSetupDialogData& operator=(const wxPageSetupData& data);
+    wxPageSetupDialogData& operator=(const wxPrintData& data);

 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
 #if defined(__WIN95__)
     void*           m_pageSetupData;
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
 #if defined(__WIN95__)
     void*           m_pageSetupData;

-#elif defined( __WXMAC__  )
-       THPrint         m_macPageSetupInfo ;

 #endif
 
 private:
 #endif
 
 private:

-

     wxSize          m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)
     wxPoint         m_minMarginTopLeft;
     wxPoint         m_minMarginBottomRight;
     wxPoint         m_marginTopLeft;
     wxPoint         m_marginBottomRight;
     wxSize          m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)
     wxPoint         m_minMarginTopLeft;
     wxPoint         m_minMarginBottomRight;
     wxPoint         m_marginTopLeft;
     wxPoint         m_marginBottomRight;

-
-    // Flags

     bool            m_defaultMinMargins;
     bool            m_enableMargins;
     bool            m_enableOrientation;
     bool            m_defaultMinMargins;
     bool            m_enableMargins;
     bool            m_enableOrientation;


@@ -408,8 +444,10 @@ private:
     bool            m_enablePrinter;
     bool            m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
     bool            m_enableHelp;
     bool            m_enablePrinter;
     bool            m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
     bool            m_enableHelp;

-

     wxPrintData     m_printData;
     wxPrintData     m_printData;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)

 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE