diff options
| author | NatsuDrag9 | 2018-06-26 10:39:51 +0530 |
|---|---|---|
| committer | NatsuDrag9 | 2018-06-26 10:39:51 +0530 |
| commit | d3f238d01fd368ce36fe3b59df63406b27c018f7 (patch) | |
| tree | dc80af072e1699caf155730efd60305af62ee2b4 /ldmicro/includes | |
| parent | cc789def969c9b1ddc5338a934c2c63717177351 (diff) | |
| parent | 0dad08dd60d4de845db5a7f0d0948b3503c46d4a (diff) | |
| download | LDMicroGtk-d3f238d01fd368ce36fe3b59df63406b27c018f7.tar.gz LDMicroGtk-d3f238d01fd368ce36fe3b59df63406b27c018f7.tar.bz2 LDMicroGtk-d3f238d01fd368ce36fe3b59df63406b27c018f7.zip | |
Merged files for testing dialogs.
Diffstat (limited to 'ldmicro/includes')
| -rw-r--r-- | ldmicro/includes/ldmicro.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ldmicro/includes/ldmicro.h b/ldmicro/includes/ldmicro.h index bd38e1a..0822179 100644 --- a/ldmicro/includes/ldmicro.h +++ b/ldmicro/includes/ldmicro.h @@ -589,7 +589,6 @@ void RefreshScrollbars(void); extern HINSTANCE Instance; extern HWID MainWindow; extern HWID DrawWindow; -// extern HCRDC Hcr; extern PlcProgram Prog; extern char CurrentSaveFile[MAX_PATH]; extern char CurrentCompileFile[MAX_PATH]; @@ -632,7 +631,7 @@ extern BOOL ThisHighlighted; // draw_outputdev.cpp extern void (*DrawChars)(HCRDC Hcr, int, int, const char *); -gboolean BlinkCursor(GtkWidget * window); +BOOL BlinkCursor(BOOL kill); void PaintWindow(HCRDC Hcr); void ExportDrawingAsText(char *file); void InitForDrawing(void); @@ -794,10 +793,17 @@ 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 BOOL DialogDone; +// extern BOOL DialogCancel; +>>>>>>> akshay-c-GUI_port // lang.cpp char *_(char *in); @@ -805,7 +811,7 @@ char *_(char *in); // simulate.cpp void SimulateOneCycle(BOOL forceRefresh); -void CALLBACK PlcCycleTimer(HWND hwnd, UINT msg, UINT_PTR id, DWORD time); +BOOL PlcCycleTimer(BOOL kill); void StartSimulationTimer(void); void ClearSimulationData(void); void DescribeForIoList(char *name, char *out); |