diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-09 14:39:42 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-09 14:39:42 +0000 |
| commit | 52ae3582a2c7bb437df33c0a30bfd5a01d6c5282 (patch) | |
| tree | 4f532a97ab0a6a1c2f96454290bc8803ee022f1f /test/sudoku.cxx | |
| parent | 30dad6a4aa2b94fe91783160c86abc75f9dc9e23 (diff) | |
Replace "WIN32" with "_WIN32" or "Windows".
Replace compiler/preprocessor/platform macro "WIN32" with "_WIN32".
Replace "WIN32" in text and documentation with "Windows".
Replace "MSWindows" with "Windows".
To do: README.Windows.txt (and maybe other documentation as well)
needs updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12655 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test/sudoku.cxx')
| -rw-r--r-- | test/sudoku.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/sudoku.cxx b/test/sudoku.cxx index 218e81b35..14255daab 100644 --- a/test/sudoku.cxx +++ b/test/sudoku.cxx @@ -33,20 +33,20 @@ #include <time.h> #include <FL/math.h> -#ifdef WIN32 +#ifdef _WIN32 # include "sudokurc.h" #elif !defined(__APPLE__) # include "pixmaps/sudoku.xbm" -#endif // WIN32 +#endif // _WIN32 // Audio headers... #include <config.h> -#ifndef WIN32 +#ifndef _WIN32 # include <unistd.h> -#endif // !WIN32 +#endif // !_WIN32 -#if defined(WIN32) || defined(__APPLE__) +#if defined(_WIN32) || defined(__APPLE__) #elif defined(FL_PORTING) # pragma message "FL_PORTING: FLTK does not provide cross platform sound support" #else @@ -59,9 +59,9 @@ #ifdef __APPLE__ # include <CoreAudio/AudioHardware.h> #endif // __APPLE__ -#ifdef WIN32 +#ifdef _WIN32 # include <mmsystem.h> -#endif // WIN32 +#endif // _WIN32 // @@ -113,7 +113,7 @@ class SudokuSound { AudioBufferList *data_out, const AudioTimeStamp *time_out, void *client_data); -#elif defined(WIN32) +#elif defined(_WIN32) HWAVEOUT device; HGLOBAL header_handle; LPWAVEHDR header_ptr; @@ -259,7 +259,7 @@ SudokuSound::SudokuSound() { sample_size = (int)format.mSampleRate / 20; -#elif defined(WIN32) +#elif defined(_WIN32) WAVEFORMATEX format; memset(&format, 0, sizeof(format)); @@ -364,7 +364,7 @@ SudokuSound::~SudokuSound() { # endif } -#elif defined(WIN32) +#elif defined(_WIN32) if (sample_size) { waveOutClose(device); @@ -438,7 +438,7 @@ void SudokuSound::play(char note) { // Wait for the sound to complete... usleep(NOTE_DURATION*1000); -#elif defined(WIN32) +#elif defined(_WIN32) if (sample_size) { memcpy(data_ptr, sample_data[note - 'A'], sample_size * 4); @@ -711,14 +711,14 @@ Sudoku::Sudoku() } // Set icon for window (MacOS uses app bundle for icon...) -#ifdef WIN32 +#ifdef _WIN32 icon((char *)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON))); #elif !defined(__APPLE__) fl_open_display(); icon((char *)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display), (char *)sudoku_bits, sudoku_width, sudoku_height)); -#endif // WIN32 +#endif // _WIN32 // Catch window close events... callback(close_cb); |