Make wxChoicebook background transparent.

[wxWidgets.git] / include / wx / richtext / richtextimagedlg.h

diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h
index 12c2aa1045483fc3ce4b6bbad7ab11f5e328f962..10b0ddc1236d2b6445a0c473511352bed8dc9710 100644 (file)
--- a/include/wx/richtext/richtextimagedlg.h
+++ b/include/wx/richtext/richtextimagedlg.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/richtext/richtextimagedlg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/richtext/richtextimagedlg.h

-// Purpose:     
+// Purpose:

 // Author:      Mingquan Yang
 // Author:      Mingquan Yang

-// Modified by: 
+// Modified by:

 // Created:     Wed 02 Jun 2010 11:27:23 CST
 // Created:     Wed 02 Jun 2010 11:27:23 CST

-// RCS-ID:      
+// RCS-ID:

 // Copyright:   (c) Mingquan Yang
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Mingquan Yang
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
  */
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextImageDialog: public wxDialog
  */
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextImageDialog: public wxDialog

-{    
+{

     DECLARE_DYNAMIC_CLASS( wxRichTextImageDialog )
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS( wxRichTextImageDialog )
     DECLARE_EVENT_TABLE()
 


@@ -66,6 +66,12 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
     /// 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
 ////@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
     static bool ShowToolTips();
 
     /// Set the image attribute

-    void SetImageAttr(const wxRichTextAnchoredObjectAttr& attr);
+    void SetImageAttr(const wxRichTextAttr& textAttr);

     wxRichTextImage* ApplyImageAttr();
 
     /// Set the anchored object
     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:
     /// Convert CM to MM
     bool ConvertFromString(const wxString& string, int& ret, int scale);
 private:

-    wxRichTextAnchoredObjectAttr m_attr;
+    wxRichTextAttr m_textAttr;
+    

 ////@begin wxRichTextImageDialog member variables
 ////@begin wxRichTextImageDialog member variables

-    wxComboBox* m_alignment;

     wxComboBox* m_float;
     wxTextCtrl* m_width;
     wxComboBox* m_unitsW;
     wxComboBox* m_float;
     wxTextCtrl* m_width;
     wxComboBox* m_unitsW;


@@ -116,7 +122,6 @@ private:
     /// Control identifiers
     enum {
         ID_WXRICHTEXTIMAGEPAGE = 10015,
     /// Control identifiers
     enum {
         ID_WXRICHTEXTIMAGEPAGE = 10015,

-        ID_COMBOBOX_ALIGN = 10016,

         ID_RICHTEXTIMAGEDIALOG_FLOATING_MODE = 10017,
         ID_RICHTEXTIMAGEDIALOG_WIDTH = 10018,
         ID_RICHTEXTIMAGEDIALOG_UNITS_W = 10019,
         ID_RICHTEXTIMAGEDIALOG_FLOATING_MODE = 10017,
         ID_RICHTEXTIMAGEDIALOG_WIDTH = 10018,
         ID_RICHTEXTIMAGEDIALOG_UNITS_W = 10019,