fixing wrong version commit

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

diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h
index bdc7f4c421189770a12115bdabc15d6db3839991..4f00278e74a7746b0bc86dc44731d1c7076c02fb 100644 (file)
--- a/interface/wx/cmndata.h
+++ b/interface/wx/cmndata.h
@@ -12,7 +12,7 @@
     This class holds a variety of information related to font dialogs.
 
     @library{wxcore}
     This class holds a variety of information related to font dialogs.
 
     @library{wxcore}

-    @category{cmndlg}
+    @category{cmndlg,data}

 
     @see @ref overview_cmndlg_font, wxFont, wxFontDialog
 */
 
     @see @ref overview_cmndlg_font, wxFont, wxFontDialog
 */


@@ -137,7 +137,7 @@ public:
     stored by wxPageSetupDialogData).
 
     @library{wxcore}
     stored by wxPageSetupDialogData).
 
     @library{wxcore}

-    @category{printing}
+    @category{printing,data}

 
     @see @ref overview_printing, wxPageSetupDialog
 */
 
     @see @ref overview_printing, wxPageSetupDialog
 */


@@ -349,7 +349,7 @@ public:
     This class holds a variety of information related to colour dialogs.
 
     @library{wxcore}
     This class holds a variety of information related to colour dialogs.
 
     @library{wxcore}

-    @category{cmndlg}
+    @category{cmndlg,data}

 
     @see wxColour, wxColourDialog, @ref overview_cmndlg_colour
 */
 
     @see wxColour, wxColourDialog, @ref overview_cmndlg_colour
 */


@@ -424,14 +424,21 @@ public:
     void SetCustomColour(int i, const wxColour& colour);
 
     /**
     void SetCustomColour(int i, const wxColour& colour);
 
     /**

-        Assignment operator for the colour data.
+        Converts the colours saved in this class in a string form, separing
+        the various colours with a comma.

     */
     */

-    wxColourData& operator =(const wxColourData& data);
+    wxString ToString() const;

 
 

+    /**
+        Decodes the given string, which should be in the same format returned
+        by ToString(), and sets the internal colours.
+    */
+    bool FromString(const wxString& str);

 
 

-    /** @todo document these */
-    wxString wxColourData::ToString() const;
-    bool wxColourData::FromString(const wxString& str);
+    /**
+        Assignment operator for the colour data.
+    */
+    wxColourData& operator =(const wxColourData& data);

 };
 
 
 };
 
 


@@ -504,7 +511,7 @@ enum wxPrintBin
     @endcode
 
     @library{wxcore}
     @endcode
 
     @library{wxcore}

-    @category{printing}
+    @category{printing,data}

 
     @see @ref overview_printing, wxPrintDialog, wxPageSetupDialog,
          wxPrintDialogData, wxPageSetupDialogData, @ref overview_cmndlg_print,
 
     @see @ref overview_printing, wxPrintDialog, wxPageSetupDialog,
          wxPrintDialogData, wxPageSetupDialogData, @ref overview_cmndlg_print,


@@ -560,7 +567,7 @@ public:
     /**
         Gets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */
     /**
         Gets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */

-    int GetOrientation() const;
+    wxPrintOrientation GetOrientation() const;

 
     /**
         Returns the paper size id.
 
     /**
         Returns the paper size id.


@@ -627,7 +634,7 @@ public:
     /**
         Sets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */
     /**
         Sets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */

-    void SetOrientation(int orientation);
+    void SetOrientation(wxPrintOrientation orientation);

 
     /**
         Sets the paper id. This indicates the type of paper to be used. For a
 
     /**
         Sets the paper id. This indicates the type of paper to be used. For a


@@ -674,7 +681,7 @@ public:
     settings.
 
     @library{wxcore}
     settings.
 
     @library{wxcore}

-    @category{printing}
+    @category{printing,cmndlg,data}

 
     @see @ref overview_printing, wxPrintDialog, @ref overview_cmndlg_print
 */
 
     @see @ref overview_printing, wxPrintDialog, @ref overview_cmndlg_print
 */