fix signature of wxClipboard::UserPrimarySelection; in particular change the default...

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

diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h
index 70c26781d19fdb1945982cfe1dfadb6b0f3f7db3..4c59595f7fc7f82d249b42b99e3a0be623fc0a75 100644 (file)
--- a/interface/wx/cmndata.h
+++ b/interface/wx/cmndata.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxFontData
-    @wxheader{cmndata.h}
 
     This class holds a variety of information related to font dialogs.
 
@@ -42,13 +41,13 @@ public:
 
         The default value is @true.
     */
-    bool GetAllowSymbols();
+    bool GetAllowSymbols() const;
 
     /**
         Gets the font chosen by the user if the user pressed OK
         (wxFontDialog::ShowModal() returned wxID_OK).
     */
-    wxFont GetChosenFont();
+    wxFont GetChosenFont() const;
 
     /**
         Gets the colour associated with the font dialog.
@@ -64,20 +63,20 @@ public:
 
         The default value is @true.
     */
-    bool GetEnableEffects();
+    bool GetEnableEffects() const;
 
     /**
         Gets the font that will be initially used by the font dialog. This
         should have previously been set by the application.
     */
-    wxFont GetInitialFont();
+    wxFont GetInitialFont() const;
 
     /**
         Returns @true if the Help button will be shown (Windows only).
 
         The default value is @false.
     */
-    bool GetShowHelp();
+    bool GetShowHelp() const;
 
     /**
         Under Windows, determines whether symbol fonts can be selected. Has no
@@ -130,7 +129,6 @@ public:
 
 /**
     @class wxPageSetupDialogData
-    @wxheader{cmndata.h}
 
     This class holds a variety of information related to wxPageSetupDialog.
 
@@ -164,7 +162,7 @@ public:
     /**
         Destructor.
     */
-    ~wxPageSetupDialogData();
+    virtual ~wxPageSetupDialogData();
 
     /**
         Enables or disables the "Help" button (Windows only).
@@ -346,7 +344,6 @@ public:
 
 /**
     @class wxColourData
-    @wxheader{cmndata.h}
 
     This class holds a variety of information related to colour dialogs.
 
@@ -368,7 +365,7 @@ public:
     /**
         Destructor.
     */
-    ~wxColourData();
+    virtual ~wxColourData();
 
     /**
         Under Windows, determines whether the Windows colour dialog will
@@ -386,7 +383,7 @@ public:
 
         The default colour is black.
     */
-    wxColour& GetColour() const;
+    wxColour& GetColour();
 
     /**
         Returns custom colours associated with the colour dialog.
@@ -459,7 +456,6 @@ enum wxPrintBin
 
 /**
     @class wxPrintData
-    @wxheader{cmndata.h}
 
     This class holds a variety of information related to printers and printer
     device contexts. This class is used to create a wxPrinterDC and a
@@ -522,7 +518,7 @@ public:
     /**
         Destructor.
     */
-    ~wxPrintData();
+    virtual ~wxPrintData();
 
     /**
         Returns the current bin (papersource). By default, the system is left
@@ -664,7 +660,6 @@ public:
 
 /**
     @class wxPrintDialogData
-    @wxheader{cmndata.h}
 
     This class holds information related to the visual characteristics of
     wxPrintDialog. It contains a wxPrintData object with underlying printing
@@ -696,7 +691,7 @@ public:
     /**
         Destructor.
     */
-    ~wxPrintDialogData();
+    virtual ~wxPrintDialogData();
 
     /**
         Enables or disables the "Help" button.