Changeset 6706

Show
Ignore:
Timestamp:
09/11/11 11:54:25 (3 years ago)
Author:
andrey.kamaev
Message:

Fixed fullscreen window mode on Windows.

Location:
trunk/opencv/modules/highgui/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/opencv/modules/highgui/src/precomp.hpp

    r6576 r6706  
    4949#include "cvconfig.h" 
    5050 
     51#if defined WIN32 || defined _WIN32 
     52 
     53#define WIN32_LEAN_AND_MEAN 
     54#include <windows.h> 
     55#undef min 
     56#undef max 
     57 
     58void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); 
     59#endif 
     60 
    5161#include "opencv2/highgui/highgui.hpp" 
    5262#include "opencv2/highgui/highgui_c.h" 
     
    6373#ifdef HAVE_TEGRA_OPTIMIZATION 
    6474#include "opencv2/highgui/highgui_tegra.hpp" 
    65 #endif 
    66  
    67 #if defined WIN32 || defined _WIN32 
    68  
    69 #define WIN32_LEAN_AND_MEAN 
    70 #include <windows.h> 
    71 #undef min 
    72 #undef max 
    73  
    74 void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); 
    7575#endif 
    7676 
  • trunk/opencv/modules/highgui/src/window_w32.cpp

    r5105 r6706  
    421421                { 
    422422                        icvLoadWindowPos(window->name,position ); 
    423                         SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle | WS_CAPTION); 
     423                        SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle | WS_CAPTION | WS_THICKFRAME); 
    424424 
    425425                        SetWindowPos(window->frame, HWND_TOP, position.x, position.y , position.width,position.height, SWP_NOZORDER | SWP_FRAMECHANGED); 
     
    448448                        position.x=mi.rcMonitor.left;position.y=mi.rcMonitor.top; 
    449449                        position.width=mi.rcMonitor.right - mi.rcMonitor.left;position.height=mi.rcMonitor.bottom - mi.rcMonitor.top; 
    450                         SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle & ~WS_CAPTION); 
     450                        SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle & ~WS_CAPTION & ~WS_THICKFRAME); 
    451451 
    452452                        SetWindowPos(window->frame, HWND_TOP, position.x, position.y , position.width,position.height, SWP_NOZORDER | SWP_FRAMECHANGED);