Changeset 13

Timestamp:

12/06/07 20:42:15 (9 months ago)

Author:

Chris Miller

Message:

Control.onKeyPress and keyPress now take KeyPressEventArgs?.
Fixed MenuItem?.radioCheck.
Added function Control.enableVisualStyle to toggle visual style per control.

Files:

• trunk/win32/dfl/base.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (7 diffs)
• trunk/win32/dfl/form.d (modified) (1 diff)
• trunk/win32/dfl/internal/winapi.d (modified) (2 diffs)
• trunk/win32/dfl/menu.d (modified) (3 diffs)
• trunk/win32/dfl/textbox.d (modified) (1 diff)

trunk/win32/dfl/base.d

@@ -852 +852 @@
-
-///
+class KeyPressEventArgs: KeyEventArgs
+{
+    ///
+    this(dchar ch)
+    {
+        this(ch, (ch >= 'A' && ch <= 'Z') ? Keys.SHIFT : Keys.NONE);
+    }
+    
+    /// ditto
+    this(dchar ch, Keys modifiers)
+    in
+    {
+        assert((modifiers & Keys.MODIFIERS) == modifiers, "modifiers parameter can only contain modifiers");
+    }
+    body
+    {
+        _keych = ch;
+        
+        int vk;
+        if(dfl.internal.utf.useUnicode)
+            vk = 0xFF & VkKeyScanW(ch);
+        else
+            vk = 0xFF & VkKeyScanA(cast(char)ch);
+        
+        super(cast(Keys)(vk | modifiers));
+    }
+    
+    
+    ///
+    final dchar keyChar() // getter
+    {
+        return _keych;
+    }
+    
+    
+    private:
+    dchar _keych;
+}
+
+
+///
-class MouseEventArgs: EventArgs
-{

trunk/win32/dfl/control.d

@@ -3879 +3879 @@
-    
-    ///
-
+Press
-    {
-        keyPress(this, kea);
@@ -4102 +4102 @@
-    protected void onHandleCreated(EventArgs ea)
-    {
+        if(!(cbits & CBits.VSTYLE))
+            _disableVisualStyle();
+        
-        Font fon;
-        fon = font;
@@ -5563 +5566 @@
-    Event!(Control, KeyEventArgs) keyDown; ///
-    //KeyEventHandler keyPress;
-
+Press
-    //KeyEventHandler keyUp;
-    Event!(Control, KeyEventArgs) keyUp; ///
@@ -5791 +5794 @@
-    /+
-    // ///
+    // I don't think this is reliable.
-    final bool hasVisualStyle() // getter
-    {
@@ -5809 +5813 @@
-    }
-    +/
+    
+    
+    package final void _disableVisualStyle()
+    {
+        assert(isHandleCreated);
+        
+        HMODULE hmuxt;
+        hmuxt = GetModuleHandleA("uxtheme.dll");
+        if(hmuxt)
+        {
+            auto setWinTheme = cast(typeof(&SetWindowTheme))GetProcAddress(hmuxt, "SetWindowTheme");
+            if(setWinTheme)
+            {
+                setWinTheme(hwnd, " "w.ptr, " "w.ptr); // Clear the theme.
+            }
+        }
+    }
+    
+    
+    ///
+    public final void enableVisualStyle(bool byes = true)
+    {
+        if(byes)
+        {
+            if(cbits & CBits.VSTYLE)
+                return;
+            cbits |= CBits.VSTYLE;
+            
+            if(isHandleCreated)
+            {
+                _crecreate();
+            }
+        }
+        else
+        {
+            if(!(cbits & CBits.VSTYLE))
+                return;
+            cbits &= ~CBits.VSTYLE;
+            
+            if(isHandleCreated)
+                _disableVisualStyle();
+        }
+    }
-    
-    
@@ -6443 +6490 @@
-            case WM_CHAR:
-                {
-
-
-
-
-
-
-
-
+
+
+
-                        return true;
-                }
@@ -6632 +6674 @@
-        RECREATING = 0x100000,
-        HAS_LAYOUT = 0x200000,
+        VSTYLE = 0x400000, // If not forced off.
-    }
-    
-    //CBits cbits = CBits.ALLOW_LAYOUT;
-    //CBits cbits = CBits.NONE;
-
+ | CBits.VSTYLE
-    
-    

trunk/win32/dfl/form.d

@@ -2833 +2833 @@
-    
-    
-    /+
-    protected override void onKeyPress(KeyEventArgs ea)
-    {
-        super.onKeyPress(ea);
-        
-        if(!ea.handled)
-        {
-            if(ea.keyCode == Keys.ESCAPE)
-            {
-                if(cancelBtn)
-                {
-                    cancelBtn.performClick();
-                    ea.handled = true;
-                }
-            }
-        }
-    }
-    +/
-    
-    
-    package final bool _dlgescape()
-    {

trunk/win32/dfl/internal/winapi.d

@@ -62 +62 @@
-    
-    alias ulong DWORDLONG;
+    
+    
+    alias HRESULT THEMEAPI;
-    
-    
@@ -2767 +2770 @@
-    BOOL PatBlt(HDC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, DWORD dwRop);
-    HTHEME GetWindowTheme(HWND hWnd);
+    THEMEAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, LPCWSTR pszSubIdList);
-    int SetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL fRedraw);
-    BOOL GetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi);

trunk/win32/dfl/menu.d

@@ -188 +188 @@
-            
-            miparent = cast(MenuItem)mparent;
-.parent() && miparent.
+ && mi
-            {
-                MENUITEMINFOA miiPopup;
@@ -390 +390 @@
-    final void radioCheck(bool byes) // setter
-    {
+        auto par = parent;
+        auto pidx = index;
+        if(par)
+            par.menuItems._removing(pidx, this);
+        
-        if(byes)
-
-
-
+
+
+
+
+
+
+
+
-    }
-    
@@ -804 +814 @@
-        
-        
-rivat
+ackag
-        
-        Menu _owner;

trunk/win32/dfl/textbox.d

@@ -850 +850 @@
-            msg.result = dfl.internal.utf.callWindowProc(textBoxPrevWndProc, msg.hWnd, msg.msg, msg.wParam, msg.lParam);
-    }
-    
-    
-    /+
-    protected override void onKeyPress(KeyEventArgs ea)
-    {
-        //super.onKeyPress(ea);
-        //if(!ea.handled)
-        {
-            if(ea.keyCode == Keys.ESCAPE)
-            {
-                /+
-                Form cp;
-                cp = cast(Form)topLevelControl();
-                if(cp)
-                    cp._keypressed(ea);
-                +/
-                ea.handled = true;
-                // Note: can't let this go unhandled or Windows will close the parent.
-                return;
-            }
-        }
-        super.onKeyPress(ea);
-    }
-    +/
-    
-