X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce00f59b5b169752d2f05ce3bb1a88ddc1b38b4c..d93cc830804df17292da7471856a5570574e0bb7:/src/richtext/richtextimagedlg.cpp diff --git a/src/richtext/richtextimagedlg.cpp b/src/richtext/richtextimagedlg.cpp index ef59d9bfc6..982df5ecf2 100644 --- a/src/richtext/richtextimagedlg.cpp +++ b/src/richtext/richtextimagedlg.cpp @@ -16,9 +16,14 @@ #pragma hdrstop #endif + +#if wxUSE_RICHTEXT + #ifndef WX_PRECOMP #include "wx/button.h" #include "wx/combobox.h" + #include "wx/sizer.h" + #include "wx/stattext.h" #include "wx/textctrl.h" #endif @@ -109,7 +114,6 @@ wxRichTextImageDialog::~wxRichTextImageDialog() void wxRichTextImageDialog::Init() { ////@begin wxRichTextImageDialog member initialisation - m_alignment = NULL; m_float = NULL; m_width = NULL; m_unitsW = NULL; @@ -145,21 +149,8 @@ void wxRichTextImageDialog::CreateControls() wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(0, 2, 0, 0); itemBoxSizer3->Add(itemFlexGridSizer4, 0, wxALIGN_TOP|wxRIGHT, 5); - wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Alignment:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText5->Show(false); - itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxArrayString m_alignmentStrings; - m_alignmentStrings.Add(_("Left")); - m_alignmentStrings.Add(_("Centre")); - m_alignmentStrings.Add(_("Right")); - m_alignment = new wxComboBox( itemDialog1, ID_COMBOBOX_ALIGN, _("Left"), wxDefaultPosition, wxSize(80, -1), m_alignmentStrings, wxCB_READONLY ); - m_alignment->SetStringSelection(_("Left")); - m_alignment->Show(false); - itemFlexGridSizer4->Add(m_alignment, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxStaticText* itemStaticText7 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Floating mode:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText7, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Floating mode:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_floatStrings; m_floatStrings.Add(_("None")); @@ -172,17 +163,17 @@ void wxRichTextImageDialog::CreateControls() m_float->SetToolTip(_("How the image will float relative to the text.")); itemFlexGridSizer4->Add(m_float, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Width:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText9, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText7 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Width:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer4->Add(itemStaticText7, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer4->Add(itemBoxSizer10, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); + wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); m_width = new wxTextCtrl( itemDialog1, ID_RICHTEXTIMAGEDIALOG_WIDTH, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 ); m_width->SetHelpText(_("The image width to be shown - does not change the source image width.")); if (wxRichTextImageDialog::ShowToolTips()) m_width->SetToolTip(_("The image width to be shown - does not change the source image width.")); - itemBoxSizer10->Add(m_width, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer8->Add(m_width, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_unitsWStrings; m_unitsWStrings.Add(_("px")); @@ -192,19 +183,19 @@ void wxRichTextImageDialog::CreateControls() m_unitsW->SetHelpText(_("Units for the image width.")); if (wxRichTextImageDialog::ShowToolTips()) m_unitsW->SetToolTip(_("Units for the image width.")); - itemBoxSizer10->Add(m_unitsW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer8->Add(m_unitsW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText13 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Height:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText13, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText11 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Height:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer4->Add(itemStaticText11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer4->Add(itemBoxSizer14, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); + wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer4->Add(itemBoxSizer12, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); m_height = new wxTextCtrl( itemDialog1, ID_RICHTEXTIMAGEDIALOG_HEIGHT, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 ); m_height->SetHelpText(_("The image height to be shown - does not change the source image height.")); if (wxRichTextImageDialog::ShowToolTips()) m_height->SetToolTip(_("The image height to be shown - does not change the source image height.")); - itemBoxSizer14->Add(m_height, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer12->Add(m_height, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_unitsHStrings; m_unitsHStrings.Add(_("px")); @@ -214,20 +205,20 @@ void wxRichTextImageDialog::CreateControls() m_unitsH->SetHelpText(_("Units for the image height.")); if (wxRichTextImageDialog::ShowToolTips()) m_unitsH->SetToolTip(_("Units for the image height.")); - itemBoxSizer14->Add(m_unitsH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer12->Add(m_unitsH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText17 = new wxStaticText( itemDialog1, wxID_STATIC, _("Image Vertical &Offset:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText17, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Image Vertical &Offset:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer4->Add(itemStaticText15, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer18 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer4->Add(itemBoxSizer18, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); + wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer4->Add(itemBoxSizer16, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); m_offset = new wxTextCtrl( itemDialog1, ID_RICHTEXTIMAGEDIALOG_OFFSET, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 ); m_offset->SetMaxLength(10); m_offset->SetHelpText(_("The vertical offset relative to the paragraph.")); if (wxRichTextImageDialog::ShowToolTips()) m_offset->SetToolTip(_("The vertical offset relative to the paragraph.")); - itemBoxSizer18->Add(m_offset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer16->Add(m_offset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_unitsOffsetStrings; m_unitsOffsetStrings.Add(_("px")); @@ -237,45 +228,45 @@ void wxRichTextImageDialog::CreateControls() m_unitsOffset->SetHelpText(_("Units for the image offset.")); if (wxRichTextImageDialog::ShowToolTips()) m_unitsOffset->SetToolTip(_("Units for the image offset.")); - itemBoxSizer18->Add(m_unitsOffset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer16->Add(m_unitsOffset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText21 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Move the image to:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText21, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText19 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Move the image to:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer4->Add(itemStaticText19, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer4->Add(itemBoxSizer22, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); + wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer4->Add(itemBoxSizer20, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); - wxButton* itemButton23 = new wxButton( itemDialog1, ID_RICHTEXTIMAGEDIALOG_PARA_UP, _("&Previous Paragraph"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton23->SetHelpText(_("Moves the image to the previous paragraph.")); + wxButton* itemButton21 = new wxButton( itemDialog1, ID_RICHTEXTIMAGEDIALOG_PARA_UP, _("&Previous Paragraph"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton21->SetHelpText(_("Moves the image to the previous paragraph.")); if (wxRichTextImageDialog::ShowToolTips()) - itemButton23->SetToolTip(_("Moves the image to the previous paragraph.")); - itemBoxSizer22->Add(itemButton23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemButton21->SetToolTip(_("Moves the image to the previous paragraph.")); + itemBoxSizer20->Add(itemButton21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton24 = new wxButton( itemDialog1, ID_RICHTEXTIMAGEDIALOG_DOWN, _("&Next Paragraph"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton24->SetHelpText(_("Moves the image to the next paragraph.")); + wxButton* itemButton22 = new wxButton( itemDialog1, ID_RICHTEXTIMAGEDIALOG_DOWN, _("&Next Paragraph"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton22->SetHelpText(_("Moves the image to the next paragraph.")); if (wxRichTextImageDialog::ShowToolTips()) - itemButton24->SetToolTip(_("Moves the image to the next paragraph.")); - itemBoxSizer22->Add(itemButton24, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5); + itemButton22->SetToolTip(_("Moves the image to the next paragraph.")); + itemBoxSizer20->Add(itemButton22, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5); - wxStaticLine* itemStaticLine25 = new wxStaticLine( itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - itemBoxSizer2->Add(itemStaticLine25, 0, wxGROW|wxALL, 5); + wxStaticLine* itemStaticLine23 = new wxStaticLine( itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + itemBoxSizer2->Add(itemStaticLine23, 0, wxGROW|wxALL, 5); - wxStdDialogButtonSizer* itemStdDialogButtonSizer26 = new wxStdDialogButtonSizer; + wxStdDialogButtonSizer* itemStdDialogButtonSizer24 = new wxStdDialogButtonSizer; - itemBoxSizer2->Add(itemStdDialogButtonSizer26, 0, wxGROW|wxALL, 5); + itemBoxSizer2->Add(itemStdDialogButtonSizer24, 0, wxGROW|wxALL, 5); m_saveButton = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); m_saveButton->SetHelpText(_("Click to confirm your changes.")); if (wxRichTextImageDialog::ShowToolTips()) m_saveButton->SetToolTip(_("Click to confirm your changes.")); - itemStdDialogButtonSizer26->AddButton(m_saveButton); + itemStdDialogButtonSizer24->AddButton(m_saveButton); m_cancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); m_cancelButton->SetHelpText(_("Click to discard your changes.")); if (wxRichTextImageDialog::ShowToolTips()) m_cancelButton->SetToolTip(_("Click to discard your changes.")); - itemStdDialogButtonSizer26->AddButton(m_cancelButton); + itemStdDialogButtonSizer24->AddButton(m_cancelButton); - itemStdDialogButtonSizer26->Realize(); + itemStdDialogButtonSizer24->Realize(); ////@end wxRichTextImageDialog content construction } @@ -319,9 +310,10 @@ wxIcon wxRichTextImageDialog::GetIconResource( const wxString& name ) /*! * Set the image attribute */ -void wxRichTextImageDialog::SetImageAttr(const wxRichTextAnchoredObjectAttr& attr) +void wxRichTextImageDialog::SetImageAttr(const wxRichTextAttr& textAttr) { - m_attr = attr; + m_textAttr = textAttr; + TransferDataToWindow(); } @@ -335,7 +327,7 @@ wxRichTextImage* wxRichTextImageDialog::ApplyImageAttr() TransferDataFromWindow(); if (m_buffer->GetRichTextCtrl()) { - m_buffer->GetRichTextCtrl()->SetImageStyle(image, m_attr); + m_buffer->GetRichTextCtrl()->SetImageStyle(image, m_textAttr); } return image; } @@ -347,107 +339,77 @@ void wxRichTextImageDialog::SetImageObject(wxRichTextImage* image, wxRichTextBuf m_buffer = buffer; m_image = image; m_parent = parent; - SetImageAttr(image->GetAnchoredAttr()); + SetImageAttr(image->GetAttributes()); if (image->GetImageCache().IsOk()) { - if (m_attr.m_width == -1) + if (!m_textAttr.GetTextBoxAttr().GetWidth().IsPresent() || m_textAttr.GetTextBoxAttr().GetWidth().GetValue() <= 0) { - m_attr.m_width = image->GetImageCache().GetWidth(); - wxASSERT(m_attr.m_unitsW == wxRICHTEXT_PX); - - m_attr.m_unitsW = wxRICHTEXT_PX; + m_textAttr.GetTextBoxAttr().GetWidth().SetValue(image->GetImageCache().GetWidth()); + m_textAttr.GetTextBoxAttr().GetWidth().SetUnits(wxTEXT_ATTR_UNITS_PIXELS); } - if (m_attr.m_height == -1) + if (!m_textAttr.GetTextBoxAttr().GetHeight().IsPresent() || m_textAttr.GetTextBoxAttr().GetHeight().GetValue() <= 0) { - m_attr.m_height = image->GetImageCache().GetHeight(); - wxASSERT(m_attr.m_unitsH == wxRICHTEXT_PX); - - m_attr.m_unitsH = wxRICHTEXT_PX; + m_textAttr.GetTextBoxAttr().GetHeight().SetValue(image->GetImageCache().GetHeight()); + m_textAttr.GetTextBoxAttr().GetHeight().SetUnits(wxTEXT_ATTR_UNITS_PIXELS); } } } -bool wxRichTextImageDialog::TransferDataToWindow() +void wxRichTextImageDialog::SetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl) { - int remain = 100; - - m_alignment->SetSelection(m_attr.m_align); - m_float->SetSelection(m_attr.m_floating); - - // Update scale - m_unitsW->SetSelection(m_attr.m_unitsW); - m_unitsH->SetSelection(m_attr.m_unitsH); - m_unitsOffset->SetSelection(m_attr.m_unitsOffset); - - // Update metric - m_width->Clear(); - if (m_attr.m_unitsW == wxRICHTEXT_MM) + int unitsIdx = 0; + + if (!dim.IsPresent()) { - int remainder = m_attr.m_width % remain; - *m_width << m_attr.m_width / remain; - if (remainder) - { - *m_width << '.' << remainder; - } - } - else - { - *m_width << m_attr.m_width; + dim.SetValue(0); + dim.SetUnits(wxTEXT_ATTR_UNITS_PIXELS); } - m_height->Clear(); - if (m_attr.m_unitsH == wxRICHTEXT_MM) + if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) { - int remainder = m_attr.m_height % remain; - *m_height << m_attr.m_height / remain; - if (remainder) - { - *m_height << '.' << remainder; - } + unitsIdx = 1; + float value = float(dim.GetValue()) / 10.0; + valueCtrl->SetValue(wxString::Format(wxT("%.2f"), value)); } else { - *m_height << m_attr.m_height; + unitsIdx = 0; + valueCtrl->SetValue(wxString::Format(wxT("%d"), (int) dim.GetValue())); } - m_offset->Clear(); - if (m_attr.m_unitsOffset == wxRICHTEXT_MM) - { - int remainder = m_attr.m_offset % remain; - *m_offset << m_attr.m_offset / remain; - if (remainder) - { - *m_offset << '.' << remainder; - } - } + unitsCtrl->SetSelection(unitsIdx); +} + +void wxRichTextImageDialog::GetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl) +{ + if (unitsCtrl->GetSelection() == 1) + dim.SetUnits(wxTEXT_ATTR_UNITS_TENTHS_MM); else - { - *m_offset << m_attr.m_offset; - } + dim.SetUnits(wxTEXT_ATTR_UNITS_PIXELS); - return true; + int value = 0; + if (ConvertFromString(valueCtrl->GetValue(), value, dim.GetUnits())) + dim.SetValue(value); } -bool wxRichTextImageDialog::TransferDataFromWindow() +bool wxRichTextImageDialog::TransferDataToWindow() { - wxString width = m_width->GetValue(); - wxString height = m_height->GetValue(); - wxString offset = m_offset->GetValue(); - int w, h, o; + m_float->SetSelection(m_textAttr.GetTextBoxAttr().GetFloatMode()); - m_attr.m_align = m_alignment->GetSelection(); - m_attr.m_floating = m_float->GetSelection(); + SetDimensionValue(m_textAttr.GetTextBoxAttr().GetWidth(), m_width, m_unitsW); + SetDimensionValue(m_textAttr.GetTextBoxAttr().GetHeight(), m_height, m_unitsH); + SetDimensionValue(m_textAttr.GetTextBoxAttr().GetTop(), m_offset, m_unitsOffset); - m_attr.m_unitsW = m_unitsW->GetSelection(); - m_attr.m_unitsH = m_unitsH->GetSelection(); - m_attr.m_unitsOffset = m_unitsOffset->GetSelection(); + return true; +} - if (ConvertFromString(width, w, m_attr.m_unitsW)) - m_attr.m_width = w; - if (ConvertFromString(height, h, m_attr.m_unitsH)) - m_attr.m_height = h; - if (ConvertFromString(offset, o, m_attr.m_unitsOffset)) - m_attr.m_offset = o; +bool wxRichTextImageDialog::TransferDataFromWindow() +{ + m_textAttr.GetTextBoxAttr().SetFloatMode(m_float->GetSelection()); + + GetDimensionValue(m_textAttr.GetTextBoxAttr().GetWidth(), m_width, m_unitsW); + GetDimensionValue(m_textAttr.GetTextBoxAttr().GetHeight(), m_height, m_unitsH); + GetDimensionValue(m_textAttr.GetTextBoxAttr().GetTop(), m_offset, m_unitsOffset); return true; } @@ -461,7 +423,7 @@ bool wxRichTextImageDialog::ConvertFromString(const wxString& string, int& ret, for (unsigned int i = 0; i < string.Len() && remain; i++) { - if (!(chars[i] >= '0' && chars[i] <= '9') && !(scale == wxRICHTEXT_MM && chars[i] == '.')) + if (!(chars[i] >= '0' && chars[i] <= '9') && !(scale == wxTEXT_ATTR_UNITS_TENTHS_MM && chars[i] == '.')) return false; if (chars[i] == '.') @@ -476,7 +438,7 @@ bool wxRichTextImageDialog::ConvertFromString(const wxString& string, int& ret, ret = ret * 10 + chars[i] - '0'; } - while (remain-- > 0 && scale == wxRICHTEXT_MM) + while (remain-- > 0 && scale == wxTEXT_ATTR_UNITS_TENTHS_MM) ret *= 10; return true; @@ -491,7 +453,7 @@ void wxRichTextImageDialog::OnRichtextimagedialogParaUpClick( wxCommandEvent& WX // Before editing this code, remove the block markers. wxRichTextRange range = m_image->GetRange(); wxRichTextObjectList::compatibility_iterator iter = m_buffer->GetChildren().GetFirst(); - if (iter == NULL) + if (!iter) return; while (iter) @@ -502,7 +464,7 @@ void wxRichTextImageDialog::OnRichtextimagedialogParaUpClick( wxCommandEvent& WX } iter = iter->GetPrevious(); - if (iter == NULL) + if (!iter) return; wxRichTextObject *obj = iter->GetData(); @@ -525,7 +487,7 @@ void wxRichTextImageDialog::OnRichtextimagedialogDownClick( wxCommandEvent& WXUN // Before editing this code, remove the block markers. wxRichTextRange range = m_image->GetRange(); wxRichTextObjectList::compatibility_iterator iter = m_buffer->GetChildren().GetFirst(); - if (iter == NULL) + if (!iter) return; while (iter) @@ -536,7 +498,7 @@ void wxRichTextImageDialog::OnRichtextimagedialogDownClick( wxCommandEvent& WXUN } iter = iter->GetNext(); - if (iter == NULL) + if (!iter) return; wxRichTextObject *obj = iter->GetData(); @@ -549,3 +511,4 @@ void wxRichTextImageDialog::OnRichtextimagedialogDownClick( wxCommandEvent& WXUN m_image->SetRange(wxRichTextRange(rg.GetEnd(), rg.GetEnd())); } +#endif