Changeset 285

Show
Ignore:
Timestamp:
Sun Aug 6 16:09:35 2006
Author:
giovannibajo
Message:

Backport of r284 from the crypt-branch (committed there by mistake...)

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/source/windows/winmain.c

    r43 r285  
    28 28 #include "launch.h"  
    29 29 #include <windows.h>  
      30 #include <commctrl.h> // InitCommonControls  
    30 31 #include <signal.h>  
    31 32  
    …… 
    105 106 #endif  
    106 107  
      108         // Initialize common controls (needed to link with commctrl32.dll and  
      109         // obtain native XP look & feel).  
      110         InitCommonControls();  
      111  
    107 112         // fill in thisfile  
    108 113         if (!GetModuleFileNameA(NULL, thisfile, _MAX_PATH)) {  

  • trunk/source/windows/resource.h

    r43 r285  
    31 31 //  
    32 32 #define IDI_ICON1                       101  
      33 #define IDR_MANIFEST                    1  
      34 #define RT_MANIFEST                     24  
    33 35  
    34 36 // Next default values for new objects  

  • trunk/source/windows/runw.rc

    r278 r285  
    59 59 /////////////////////////////////////////////////////////////////////////////  
    60 60  
    61    
      61 // Manifest file (for native XP look & feel)  
      62 IDR_MANIFEST RT_MANIFEST MOVEABLE PURE "manifest.xml"  
    62 63  
    63 64 #ifndef APSTUDIO_INVOKED  

  • trunk/Sconstruct

    r164 r285  
    58 58  
    59 59                 env.Append(CPPDEFINES = ["WIN32"])  
    60                   env.Append(LIBS = ["user32.lib", "kernel32.lib", "ws2_32.lib"])  
      60                 env.Append(LIBS = ["user32.lib", "comctl32.lib", "kernel32.lib", "ws2_32.lib"])  
    60 60  
    61 61                 envs.append(env)