Skip to content
Snippets Groups Projects
Commit 7c51da2d authored by Olivier Couet's avatar Olivier Couet
Browse files

- Several fixes:

  - One missing include for windows.
  - One shadowed variable.
  - One wrong argument type.


git-svn-id: http://root.cern.ch/svn/root/trunk@23924 27541ba8-7e3a-0410-8455-c3a389f83636
parent d809dc03
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
//End_Html //End_Html
#include "snprintf.h"
#include "TGedEditor.h" #include "TGedEditor.h"
#include "TGComboBox.h" #include "TGComboBox.h"
#include "TGButtonGroup.h" #include "TGButtonGroup.h"
...@@ -166,8 +167,8 @@ void TPieEditor::ConnectSignals2Slots() ...@@ -166,8 +167,8 @@ void TPieEditor::ConnectSignals2Slots()
void TPieEditor::ActivateBaseClassEditors(TClass* cl) void TPieEditor::ActivateBaseClassEditors(TClass* cl)
{ {
// Exclude TAttTextEditor from this interface. // Exclude TAttTextEditor from this interface.
TGedEditor *fGedEditor = GetGedEditor(); TGedEditor *GedEditor = GetGedEditor();
fGedEditor->ExcludeClassEditor(TAttText::Class()); GedEditor->ExcludeClassEditor(TAttText::Class());
TGedFrame::ActivateBaseClassEditors(cl); TGedFrame::ActivateBaseClassEditors(cl);
} }
...@@ -375,7 +376,7 @@ void TPieEditor::DoTextChange() ...@@ -375,7 +376,7 @@ void TPieEditor::DoTextChange()
Float_t val = TString(fSizeCombo->GetSelectedEntry()->GetTitle()).Atoi(); Float_t val = TString(fSizeCombo->GetSelectedEntry()->GetTitle()).Atoi();
Float_t dy = pad->AbsPixeltoY(0) - pad->AbsPixeltoY(val); Float_t dy = pad->AbsPixeltoY(0) - pad->AbsPixeltoY((Int_t)val);
Float_t textSize; Float_t textSize;
if (fGedEditor->GetModel()->InheritsFrom(TPaveLabel::Class())) { if (fGedEditor->GetModel()->InheritsFrom(TPaveLabel::Class())) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment