6 files changed, 12 insertions, 11 deletions
diff --git a/ldmicro/coildialog.cpp b/ldmicro/coildialog.cpp
index 8df5893..f04de10 100644
--- a/ldmicro/coildialog.cpp
+++ b/ldmicro/coildialog.cpp
@@ -36,6 +36,8 @@ static HWID NormalRadio;
 static HWID SetOnlyRadio;
 static HWID ResetOnlyRadio;
 static HWID NameTextbox;
+static HWID OkButton;
+static HWID CancelButton;
 
 static LONG_PTR PrevNameProc;
 
diff --git a/ldmicro/confdialog.cpp b/ldmicro/confdialog.cpp
index 1c87b4b..253ebec 100644
--- a/ldmicro/confdialog.cpp
+++ b/ldmicro/confdialog.cpp
@@ -36,8 +36,8 @@ static HWID ConfDialog;
 static HWID CrystalTextbox;
 static HWID CycleTextbox;
 static HWID BaudTextbox;
-// static HWID ButtonOk;
-// static HWID ButtonCancel;
+static HWID OkButton;
+static HWID CancelButton;
 
 static LONG_PTR PrevCrystalProc;
 static LONG_PTR PrevCycleProc;
diff --git a/ldmicro/contactsdialog.cpp b/ldmicro/contactsdialog.cpp
index 0b30e32..9b6c8ff 100644
--- a/ldmicro/contactsdialog.cpp
+++ b/ldmicro/contactsdialog.cpp
@@ -34,6 +34,8 @@ static HWID SourceInternalRelayRadio;
 static HWID SourceInputPinRadio;
 static HWID SourceOutputPinRadio;
 static HWID NameTextbox;
+static HWID OkButton;
+static HWID CancelButton;
 
 static LONG_PTR PrevNameProc;
 HWID ContactsGrid;
diff --git a/ldmicro/includes/ldmicro.h b/ldmicro/includes/ldmicro.h
index 0822179..d531a68 100644
--- a/ldmicro/includes/ldmicro.h
+++ b/ldmicro/includes/ldmicro.h
@@ -793,17 +793,10 @@ void CompileSuccessfulMessage(char *str);
 extern BOOL RunningInBatchMode;
 extern HFONT MyNiceFont;
 extern HFONT MyFixedFont;
-<<<<<<< HEAD
-extern HWID OkButton;
-extern HWID CancelButton;
-extern BOOL DialogDone;
-extern BOOL DialogCancel;
-=======
-// extern HWND OkButton;
-// extern HWND CancelButton;
+// extern HWID OkButton;
+// extern HWID CancelButton;
 // extern BOOL DialogDone;
 // extern BOOL DialogCancel;
->>>>>>> akshay-c-GUI_port
 
 // lang.cpp
 char *_(char *in);
diff --git a/ldmicro/lutdialog.cpp b/ldmicro/lutdialog.cpp
index 7aea949..c65a0b8 100644
--- a/ldmicro/lutdialog.cpp
+++ b/ldmicro/lutdialog.cpp
@@ -55,6 +55,8 @@ static SWORD ValuesCache[MAX_LOOK_UP_TABLE_LEN];
 static LONG_PTR PrevDestProc;
 static LONG_PTR PrevIndexProc;
 static LONG_PTR PrevCountProc;
+static HWID OkButton;
+static HWID CancelButton;
 
 HWID LutGrid[2];
 HWID LutPackingBox;
diff --git a/ldmicro/resetdialog.cpp b/ldmicro/resetdialog.cpp
index 72071f8..04c224e 100644
--- a/ldmicro/resetdialog.cpp
+++ b/ldmicro/resetdialog.cpp
@@ -32,6 +32,8 @@ static HWID ResetDialog;
 static HWID TypeTimerRadio;
 static HWID TypeCounterRadio;
 static HWID NameTextbox;
+static HWID OkButton;
+static HWID CancelButton;
 
 static LONG_PTR PrevNameProc;
 HWID ResetGrid;