diff -aur wxHexEditor/src/HexEditor.cpp src/wxHexEditor/src/HexEditor.cpp
--- wxHexEditor/src/HexEditor.cpp 2010-04-21 17:35:38.000000000 -0500
+++ src/wxHexEditor/src/HexEditor.cpp 2010-04-27 23:04:40.000000000 -0500
@@ -868,21 +868,21 @@
GetEventHandler()->ProcessEvent( eventx );
}
-void HexEditor::FindDialog( void ){
- class FindDialog *myfind = new FindDialog::FindDialog( this, myfile );
+void HexEditor::HexFindDialog( void ){
+ FindDialog *myfind = new FindDialog( this, myfile );
myfind->ShowModal();
myfind->Destroy();
}
-void HexEditor::ReplaceDialog( void ){
- class ReplaceDialog *myfind = new ReplaceDialog::ReplaceDialog( this, myfile );
+void HexEditor::HexReplaceDialog( void ){
+ ReplaceDialog *myfind = new ReplaceDialog( this, myfile );
myfind->ShowModal();
myfind->Destroy();
}
-void HexEditor::GotoDialog( void ){
+void HexEditor::HexGotoDialog( void ){
uint64_t newoffset;
- class GotoDialog *mygoto = new GotoDialog::GotoDialog( this, newoffset, CursorOffset(), FileLength(), myDialogVector );
+ GotoDialog *mygoto = new GotoDialog( this, newoffset, CursorOffset(), FileLength(), myDialogVector );
if( mygoto->ShowModal() == wxID_OK ){
Goto( newoffset );
}
diff -aur wxHexEditor/src/HexEditorFrame.cpp src/wxHexEditor/src/HexEditorFrame.cpp
--- wxHexEditor/src/HexEditorFrame.cpp 2010-04-23 15:53:08.000000000 -0500
+++ src/wxHexEditor/src/HexEditorFrame.cpp 2010-04-27 23:05:08.000000000 -0500
@@ -295,9 +295,9 @@
case wxID_PASTE: MyHexEditor->PasteFromClipboard(); break;
case wxID_DELETE: MyHexEditor->DeleteSelection(); break;
case idInjection: MyHexEditor->InsertBytes(); break;
- case wxID_FIND: MyHexEditor->FindDialog(); break;
- case wxID_REPLACE: MyHexEditor->ReplaceDialog(); break;
- case idGotoOffset: MyHexEditor->GotoDialog(); break;
+ case wxID_FIND: MyHexEditor->HexFindDialog(); break;
+ case wxID_REPLACE: MyHexEditor->HexReplaceDialog(); break;
+ case idGotoOffset: MyHexEditor->HexGotoDialog(); break;
case idFileRO:{
MyHexEditor->SetFileAccessMode( FileDifference::ReadOnly );
MyInfoPanel->Set( MyHexEditor->GetFileName(), MyHexEditor->FileLength(), MyHexEditor->GetFileAccessModeString(), MyHexEditor->GetFD() );
diff -aur wxHexEditor/src/HexEditor.h src/wxHexEditor/src/HexEditor.h
--- wxHexEditor/src/HexEditor.h 2010-04-21 17:35:38.000000000 -0500
+++ src/wxHexEditor/src/HexEditor.h 2010-04-27 23:04:12.000000000 -0500
@@ -85,9 +85,9 @@
int GetFD( void ){ return myfile->fd(); }
bool IsAvailable_Undo( void ){ return myfile->IsAvailable_Undo(); }
bool IsAvailable_Redo( void ){ return myfile->IsAvailable_Redo(); }
- void FindDialog( void );
- void ReplaceDialog( void );
- void GotoDialog( void );
+ void HexFindDialog( void );
+ void HexReplaceDialog( void );
+ void HexGotoDialog( void );
struct DialogVector *myDialogVector;
void UpdateCursorLocation( bool force=false );