diff options
| author | NatsuDrag9 | 2018-06-27 11:32:20 +0530 |
|---|---|---|
| committer | NatsuDrag9 | 2018-06-27 11:32:20 +0530 |
| commit | e9b0e5ee354dd843ee34443dcc2baca72332ac97 (patch) | |
| tree | 9839fdb39baaf465ad6cc64fd18c1b7235d10fbb | |
| parent | d44ad200f4d576e8b61dfbc150c4a609fbbbf9f1 (diff) | |
| download | LDMicroGtk-e9b0e5ee354dd843ee34443dcc2baca72332ac97.tar.gz LDMicroGtk-e9b0e5ee354dd843ee34443dcc2baca72332ac97.tar.bz2 LDMicroGtk-e9b0e5ee354dd843ee34443dcc2baca72332ac97.zip | |
Updated variables in coil, reset and contacts dialog boxes.
| -rw-r--r-- | ldmicro/coildialog.cpp | 4 | ||||
| -rw-r--r-- | ldmicro/contactsdialog.cpp | 4 | ||||
| -rw-r--r-- | ldmicro/resetdialog.cpp | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/ldmicro/coildialog.cpp b/ldmicro/coildialog.cpp index ba9002b..1d36f98 100644 --- a/ldmicro/coildialog.cpp +++ b/ldmicro/coildialog.cpp @@ -41,8 +41,8 @@ static HWID CancelButton; static LONG_PTR PrevNameProc; -HWID CoilGrid; -HWID CoilPackingBox; +static HWID CoilGrid; +static HWID CoilPackingBox; static bool* tmpnegated; static bool* tmpsetOnly ; static bool* tmpresetOnly; diff --git a/ldmicro/contactsdialog.cpp b/ldmicro/contactsdialog.cpp index 8d6e8d4..bf896fa 100644 --- a/ldmicro/contactsdialog.cpp +++ b/ldmicro/contactsdialog.cpp @@ -38,8 +38,8 @@ static HWID OkButton; static HWID CancelButton; static LONG_PTR PrevNameProc; -HWID ContactsGrid; -HWID ContactsPackingBox; +static HWID ContactsGrid; +static HWID ContactsPackingBox; char* tmpname; BOOL* tmpnegated; //----------------------------------------------------------------------------- diff --git a/ldmicro/resetdialog.cpp b/ldmicro/resetdialog.cpp index cbcfd30..238814a 100644 --- a/ldmicro/resetdialog.cpp +++ b/ldmicro/resetdialog.cpp @@ -38,8 +38,8 @@ static HWID OkButton; static HWID CancelButton; static LONG_PTR PrevNameProc; -HWID ResetGrid; -HWID ResetPackingBox; +static HWID ResetGrid; +static HWID ResetPackingBox; //----------------------------------------------------------------------------- // Don't allow any characters other than A-Za-z0-9_ in the name. @@ -82,8 +82,8 @@ static void MakeControls(void) gtk_grid_set_column_spacing (GTK_GRID (ResetGrid), 1); gtk_box_pack_start(GTK_BOX(ResetPackingBox), ResetGrid, TRUE, TRUE, 0); - // PrevNameProc = SetWindowLongPtr(NameTextbox, GWLP_WNDPROC, - // (LONG_PTR)MyNameProc); + g_signal_connect (G_OBJECT(NameTextbox), "insert-text", + G_CALLBACK(ResetDialogMyNameProc), NULL); } void ResetDialogGetData (char* name){ @@ -147,8 +147,6 @@ void ShowResetDialog(char *name) gtk_widget_show_all (ResetDialog); gtk_widget_grab_focus (NameTextbox); - g_signal_connect (G_OBJECT(NameTextbox), "insert-text", - G_CALLBACK(ResetDialogMyNameProc), NULL); g_signal_connect (G_OBJECT (ResetDialog), "key-press-event", G_CALLBACK(ResetDialogKeyPress), (gpointer)name); g_signal_connect (G_OBJECT (OkButton), "clicked", |