Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/user32/caret.cpp

    r10379 r21916  
    2323#include <wprocess.h>
    2424#include <misc.h>
    25 #include <win32wbase.h>
     25#include "win32wbase.h"
    2626#include "oslibwin.h"
    2727#include <dcdata.h>
    … …  
    4040#endif
    4141
    42 #pragma data_seg(_GLOBALDATA)
    43 
    44 static HWND hwndCaret = 0;
    45 static HBITMAP hbmCaret;
    46 static int CaretWidth, CaretHeight;
    47 static int CaretPosX, CaretPosY;
    48 static INT CaretIsVisible; //visible if > 0
    49 
    50 #pragma data_seg()
    51 
     42//
     43// Global DLL Data (keep it in sync with globaldata.asm!)
     44//
     45extern HWND hwndCaret; // = 0
     46extern HBITMAP hbmCaret; // = 0
     47extern int CaretWidth, CaretHeight; // = 0
     48extern int CaretPosX, CaretPosY; // = 0
     49extern INT CaretIsVisible; // =0, visible if > 0
     50
     51extern "C" {
    5252
    5353BOOL WIN32API CreateCaret (HWND hwnd, HBITMAP hBmp, int width, int height)
    … …  
    262262}
    263263
     264} // extern "C"
     265
    264266void recreateCaret (HWND hwndFocus)
    265267{
Note: See TracChangeset for help on using the changeset viewer.