Skip to content

Commit

Permalink
Unify winapi imports in walk.
Browse files Browse the repository at this point in the history
Change all dot-imports to the common form
import . "walk/winapi"
This makes walk build again after the last commit.
  • Loading branch information
bsiegert committed Jul 6, 2011
1 parent 0a61293 commit 68c7c4e
Show file tree
Hide file tree
Showing 66 changed files with 70 additions and 276 deletions.
4 changes: 1 addition & 3 deletions src/pkg/walk/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

type Settings interface {
Get(key string) (string, bool)
Expand Down
6 changes: 1 addition & 5 deletions src/pkg/walk/bitmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/gdi32"
. "walk/winapi/gdiplus"
. "walk/winapi/kernel32"
)
import . "walk/winapi"

func withCompatibleDC(f func(hdc HDC) os.Error) os.Error {
hdc := CreateCompatibleDC(0)
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/boxlayout.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import (
"sort"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

type Orientation byte

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/brush.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type HatchStyle int

Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/button.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import (
"os"
)

import (
. "walk/winapi"
. "walk/winapi/user32"
)
import . "walk/winapi"

type clickable interface {
raiseClicked()
Expand Down
6 changes: 1 addition & 5 deletions src/pkg/walk/canvas.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/gdi32"
. "walk/winapi/kernel32"
. "walk/winapi/user32"
)
import . "walk/winapi"

// DrawText format flags
type DrawTextFormat uint
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/checkbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

var checkBoxOrigWndProcPtr uintptr
var _ subclassedWidget = &CheckBox{}
Expand Down
6 changes: 1 addition & 5 deletions src/pkg/walk/combobox.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi"
. "walk/winapi/gdi32"
. "walk/winapi/user32"
)
import . "walk/winapi"

var comboBoxOrigWndProcPtr uintptr
var _ subclassedWidget = &ComboBox{}
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/commondialogs.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/comdlg32"
)
import . "walk/winapi"

type FileDialog struct {
Title string
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/composite.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

const compositeWindowClass = `\o/ Walk_Composite_Class \o/`

Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ import (
"unsafe"
)

import (
. "walk/winapi"
. "walk/winapi/user32"
)
import . "walk/winapi"

type Margins struct {
HNear, VNear, HFar, VFar int
Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/cursor.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@

package walk

import (
. "walk/winapi"
. "walk/winapi/user32"
)
import . "walk/winapi"

type Cursor interface {
Dispose()
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/customwidget.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

const customWidgetWindowClass = `\o/ Walk_CustomWidget_Class \o/`

Expand Down
6 changes: 1 addition & 5 deletions src/pkg/walk/dateedit.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/comctl32"
. "walk/winapi/kernel32"
. "walk/winapi/user32"
)
import . "walk/winapi"

func systemTimeToTime(st *SYSTEMTIME) *time.Time {
if st == nil {
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/dialog.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

const (
DlgCmdOK = IDOK
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import (
"utf8"
)

import (
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type part interface {
Bounds() Rectangle
Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ import (
"syscall"
)

import (
. "walk/winapi"
. "walk/winapi/kernel32"
)
import . "walk/winapi"

var (
logErrors bool
Expand Down
7 changes: 1 addition & 6 deletions src/pkg/walk/font.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ import (
"syscall"
)

import (
. "walk/winapi"
. "walk/winapi/gdi32"
. "walk/winapi/kernel32"
. "walk/winapi/user32"
)
import . "walk/winapi"

type FontStyle byte

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/gridlayout.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import (
"sort"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

type gridLayoutCell struct {
row int
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/groupbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import (
"syscall"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

const groupBoxWindowClass = `\o/ Walk_GroupBox_Class \o/`

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/icon.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import (
"syscall"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

// Icon is a bitmap that supports transparency and combining multiple
// variants of an image in different resolutions.
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import (
"strings"
)

import (
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type Image interface {
draw(hdc HDC, location Point) os.Error
Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/imagelist.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/comctl32"
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type ImageList struct {
hIml HIMAGELIST
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/label.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

var labelOrigWndProcPtr uintptr
var _ subclassedWidget = &Label{}
Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/lineedit.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi"
. "walk/winapi/user32"
)
import . "walk/winapi"

var lineEditOrigWndProcPtr uintptr
var _ subclassedWidget = &LineEdit{}
Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/mainwindow.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/comctl32"
. "walk/winapi/user32"
)
import . "walk/winapi"

const mainWindowWindowClass = `\o/ Walk_MainWindow_Class \o/`

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/menu.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

type Menu struct {
hMenu HMENU
Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/messagebox.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import (
"syscall"
)

import (
. "walk/winapi/user32"
)
import . "walk/winapi"

type MsgBoxStyle uint

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/metafile.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type Metafile struct {
hdc HDC
Expand Down
6 changes: 1 addition & 5 deletions src/pkg/walk/notifyicon.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import (
"unsafe"
)

import (
. "walk/winapi/gdi32"
. "walk/winapi/shell32"
. "walk/winapi/user32"
)
import . "walk/winapi"

const notifyIconWindowClass = `\o/ Walk_NotifyIcon_Class \o/`

Expand Down
6 changes: 1 addition & 5 deletions src/pkg/walk/numberedit.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ import (
"unsafe"
)

import (
. "walk/winapi"
. "walk/winapi/comctl32"
. "walk/winapi/user32"
)
import . "walk/winapi"

const numberEditWindowClass = `\o/ Walk_NumberEdit_Class \o/`

Expand Down
5 changes: 1 addition & 4 deletions src/pkg/walk/pageinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import (
"os"
)

import (
. "walk/winapi/gdi32"
. "walk/winapi/kernel32"
)
import . "walk/winapi"

type ColorMode int16

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/papersize.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

package walk

import (
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type PaperSizeType int16

Expand Down
4 changes: 1 addition & 3 deletions src/pkg/walk/papersource.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

package walk

import (
. "walk/winapi/gdi32"
)
import . "walk/winapi"

type PaperSourceType int16

Expand Down
Loading

0 comments on commit 68c7c4e

Please sign in to comment.