X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6255fac96fb3f2b5bd22f1d84f3716a89a3f5c54..6cab632f3251ae1117d24544813f47c6597a3b34:/include/wx/richtext/richtextimagedlg.h?ds=sidebyside

diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h
index 12c2aa1045..10b0ddc123 100644
--- a/include/wx/richtext/richtextimagedlg.h
+++ b/include/wx/richtext/richtextimagedlg.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/richtext/richtextimagedlg.h
-// Purpose:     
+// Purpose:
 // Author:      Mingquan Yang
-// Modified by: 
+// Modified by:
 // Created:     Wed 02 Jun 2010 11:27:23 CST
-// RCS-ID:      
+// RCS-ID:
 // Copyright:   (c) Mingquan Yang
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
  */
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextImageDialog: public wxDialog
-{    
+{
     DECLARE_DYNAMIC_CLASS( wxRichTextImageDialog )
     DECLARE_EVENT_TABLE()
 
@@ -66,6 +66,12 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
+    /// Set the dimension into the value and units controls
+    void SetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl);
+
+    /// Get the dimension from the value and units controls
+    void GetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl);
+    
 ////@begin wxRichTextImageDialog event handler declarations
 
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXTIMAGEDIALOG_PARA_UP
@@ -89,7 +95,7 @@ public:
     static bool ShowToolTips();
 
     /// Set the image attribute
-    void SetImageAttr(const wxRichTextAnchoredObjectAttr& attr);
+    void SetImageAttr(const wxRichTextAttr& textAttr);
     wxRichTextImage* ApplyImageAttr();
 
     /// Set the anchored object
@@ -101,9 +107,9 @@ private:
     /// Convert CM to MM
     bool ConvertFromString(const wxString& string, int& ret, int scale);
 private:
-    wxRichTextAnchoredObjectAttr m_attr;
+    wxRichTextAttr m_textAttr;
+    
 ////@begin wxRichTextImageDialog member variables
-    wxComboBox* m_alignment;
     wxComboBox* m_float;
     wxTextCtrl* m_width;
     wxComboBox* m_unitsW;
@@ -116,7 +122,6 @@ private:
     /// Control identifiers
     enum {
         ID_WXRICHTEXTIMAGEPAGE = 10015,
-        ID_COMBOBOX_ALIGN = 10016,
         ID_RICHTEXTIMAGEDIALOG_FLOATING_MODE = 10017,
         ID_RICHTEXTIMAGEDIALOG_WIDTH = 10018,
         ID_RICHTEXTIMAGEDIALOG_UNITS_W = 10019,