Changeset 53

Timestamp:

05/16/07 02:49:16 (2 years ago)

Author:

lindquist

Message:

Win32 fixed GroupBox? bug #12

Files:

• branches/bughunt/minwin/button.d (modified) (3 diffs)
• branches/bughunt/minwin/group.d (modified) (5 diffs)
• branches/bughunt/minwin/mswindows.d (modified) (4 diffs)
• branches/bughunt/minwin/window.d (modified) (1 diff)
• branches/bughunt/samples/widgets.d (modified) (1 diff)

branches/bughunt/minwin/button.d

@@ -34 +34 @@
-        // only command is action command
-        version(LOG) log.writefln("calling action delegate");
-
+
+
-        version(MinWin32) {
-
-
+
+
+
+
+
-        if (c == ButtonClickedCommand) {
-            actionDelegate(cast(Component)this);
@@ -84 +88 @@
-            }
-            version(LOG)log.printf(" no radio button selected??\n");
-0
+-1
-        }
-    }
@@ -129 +133 @@
-        }
-        void selected(bool x) {
-
+?BST_CHECKED:BST_UNCHECKED
-        }
-    }

branches/bughunt/minwin/group.d

@@ -30 +30 @@
-         if (parent)
-             parent.addChild(this);
- 
+
-    void disposePeer(){}
-    PeerForAdd getPeerForAdd() {
-         return parent.getPeerForAdd();
- 
+
-    void getPeerOffset(inout int x, inout int y) {
-        int px, py;
@@ -119 +119 @@
-version (MinWin32) {
-
-
-
-
-
-
-
-
+
+
+
+
+
-        int labelHeight;
+        PeerWrapper groupbox;
-
-        char[] text_data;
@@ -132 +131 @@
-        void text(char[] c) {
-            text_data = c;
-
+groupbox.
-        }
-
-        this(Component parent, char[] text, char[] name = "") {
+            super(parent, name);
+            create_groupbox(this,text);
+        }
+
+        private void create_groupbox(Component parent, char[] text) {
-            PeerForAdd parentp = parent.getPeerForAdd();
-            text_data = text;
-peer
+HWND grp
-                 BS_GROUPBOX | WS_CHILD | WS_VISIBLE,
-                 0,0,10,10,parentp,
-                 cast(HMENU)0,gApp.hInstance,null);
-peer !is null, "Failed to create peer Button
-setWindowChildPeer(this,peer,OWNS_PEER
-this.name = nam
+grp !is null, "Failed to create peer GroupBox
+groupbox = new PeerWrapper(parent,grp
+groupbox.parentOwnsLayout = fals
-            Font f = standardFont(StandardFont.Gui);
-peer
-peer
+grp
+grp
-            HFONT oldFont = SelectObject(dc,f.peer);
-            TEXTMETRICA metrics;
@@ -153 +157 @@
-            labelHeight = metrics.tmHeight;
-            SelectObject(dc,oldFont);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            super.getLayoutBounds(r);
-            r.LTWH(r.left+2, r.top+labelHeight+2, r.width-4, r.height-labelHeight-4);
-        }
-
-
+override 
-            Point s;
-            if (layoutMgr) {
@@ -170 +188 @@
-            s.y = s.y + labelHeight+4;
-            s.x = s.x + 4;
-()
-()
-()
-()
+
+
+
+
-            return s;
-        }
-        mixin WindowChildImpl!();
-    }
-

branches/bughunt/minwin/mswindows.d

@@ -22 +22 @@
-export BOOL DestroyWindow (HWND hWnd);
-export BOOL MoveWindow (HWND hWnd, int x, int y, int w, int h, byte bRepaint);
-export int SetWindowLongA (HWND hWnd, int nIndex, int dwNewLong);
-export int GetWindowLongA (HWND hWnd, int nIndex);
-export int GetWindowTextA (HWND hWnd, LPTSTR str, int count);
-export int GetWindowTextW (HWND hWnd, LPWSTR str, int count);
@@ -36 +34 @@
-export int LoadStringW(HINSTANCE inst, LPWSTR id, LPWSTR buf, int siz);
-export int MessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType);
+export LRESULT CallWindowProcA(WNDPROC lpPrevWndFunc,HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam);
-
-struct INITCOMMONCONTROLSEX {
@@ -163 +162 @@
-    GW_MAX =              5
-}
-
-enum : int { GWL_USERDATA = -21 }
-
-export HWND GetWindow (HWND hWnd, int dir);
@@ -624 +621 @@
-const HWND HWND_NOTOPMOST = cast(HWND)-2;
-
+/*
+ * Window field offsets for GetWindowLong()
+ */
+export LONG GetWindowLongA(HWND hWnd,int nIndex);
+export int SetWindowLongA (HWND hWnd, int nIndex, int dwNewLong);
+enum : int {
+    GWL_WNDPROC        = -4,
+    GWL_HINSTANCE      = -6,
+    GWL_HWNDPARENT     = -8,
+    GWL_STYLE          = -16,
+    GWL_EXSTYLE        = -20,
+    GWL_USERDATA       = -21,
+    GWL_ID             = -12,
+}
+
+/*
+ * Class field offsets for GetClassLong
+ */
+export DWORD GetClassLongA(HWND hWnd,int nIndex);
+enum : int {
+    GCL_MENUNAME       = -8,
+    GCL_HBRBACKGROUND  = -10,
+    GCL_HCURSOR        = -12,
+    GCL_HICON          = -14,
+    GCL_HMODULE        = -16,
+    GCL_CBWNDEXTRA     = -18,
+    GCL_CBCLSEXTRA     = -20,
+    GCL_WNDPROC        = -24,
+    GCL_STYLE          = -26,
+    GCW_ATOM           = -32,
+    GCL_HICONSM        = -34
+}
+
-//
-// these wrappers makes windows unicode look alot better and avoids excessive code duplication

branches/bughunt/minwin/window.d

@@ -431 +431 @@
-        wc.hInstance = hInst;
-        wc.hIcon = DefaultWindowIcon.peer;
-       
+        
-        wc.hCursor = LoadCursorA(cast(HINSTANCE) null, IDC_ARROW);
-        wc.hbrBackground = null;

branches/bughunt/samples/widgets.d

@@ -21 +21 @@
-    GroupBox box = new GroupBox(win,"Group");
-    box.layoutMgr = new FlowLayout;
-    RadioGroup g = new RadioGroup;
-    RadioButton r1 = new RadioButton(box,"click me");
-    RadioButton r2 = new RadioButton(box,"no, click me");
-    RadioButton r3 = new RadioButton(box,"or me ;)");
-
-
-
+
+
-    g.select(0);
-
-
-
-
+
+
+
+
-
-    Label lab = new Label(win,"This is a label");